Merge pull request #2827 from home-assistant/hotfix-0-26-2

Hotfix 0 26 2

.coveragerc

@@ -3,6 +3,8 @@ source = homeassistant
 
 omit =
     homeassistant/__main__.py
+    homeassistant/scripts/*.py
+    homeassistant/helpers/typing.py
 
     # omit pieces of code that rely on external devices being present
     homeassistant/components/apcupsd.py
@@ -20,6 +22,9 @@ omit =
     homeassistant/components/ecobee.py
     homeassistant/components/*/ecobee.py
 
+    homeassistant/components/envisalink.py
+    homeassistant/components/*/envisalink.py
+
     homeassistant/components/insteon_hub.py
     homeassistant/components/*/insteon_hub.py
 
@@ -81,12 +86,25 @@ omit =
     homeassistant/components/netatmo.py
     homeassistant/components/*/netatmo.py
 
+    homeassistant/components/homematic.py
+    homeassistant/components/*/homematic.py
+
+    homeassistant/components/pilight.py
+    homeassistant/components/*/pilight.py
+
+    homeassistant/components/knx.py
+    homeassistant/components/switch/knx.py
+    homeassistant/components/binary_sensor/knx.py
+    homeassistant/components/thermostat/knx.py
+
     homeassistant/components/alarm_control_panel/alarmdotcom.py
     homeassistant/components/alarm_control_panel/nx584.py
+    homeassistant/components/alarm_control_panel/simplisafe.py
     homeassistant/components/binary_sensor/arest.py
     homeassistant/components/binary_sensor/rest.py
     homeassistant/components/browser.py
     homeassistant/components/camera/bloomsky.py
+    homeassistant/components/camera/ffmpeg.py
     homeassistant/components/camera/foscam.py
     homeassistant/components/camera/generic.py
     homeassistant/components/camera/mjpeg.py
@@ -110,23 +128,33 @@ omit =
     homeassistant/components/discovery.py
     homeassistant/components/downloader.py
     homeassistant/components/feedreader.py
+    homeassistant/components/foursquare.py
+    homeassistant/components/garage_door/rpi_gpio.py
     homeassistant/components/garage_door/wink.py
+    homeassistant/components/hdmi_cec.py
     homeassistant/components/ifttt.py
+    homeassistant/components/joaoapps_join.py
     homeassistant/components/keyboard.py
     homeassistant/components/light/blinksticklight.py
+    homeassistant/components/light/flux_led.py
     homeassistant/components/light/hue.py
     homeassistant/components/light/hyperion.py
     homeassistant/components/light/lifx.py
     homeassistant/components/light/limitlessled.py
     homeassistant/components/light/osramlightify.py
+    homeassistant/components/light/x10.py
     homeassistant/components/lirc.py
+    homeassistant/components/media_player/braviatv.py
     homeassistant/components/media_player/cast.py
+    homeassistant/components/media_player/cmus.py
     homeassistant/components/media_player/denon.py
+    homeassistant/components/media_player/directv.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/mpchc.py
     homeassistant/components/media_player/mpd.py
     homeassistant/components/media_player/onkyo.py
     homeassistant/components/media_player/panasonic_viera.py
@@ -134,6 +162,7 @@ omit =
     homeassistant/components/media_player/pioneer.py
     homeassistant/components/media_player/plex.py
     homeassistant/components/media_player/roku.py
+    homeassistant/components/media_player/russound_rnet.py
     homeassistant/components/media_player/samsungtv.py
     homeassistant/components/media_player/snapcast.py
     homeassistant/components/media_player/sonos.py
@@ -144,8 +173,8 @@ omit =
     homeassistant/components/notify/aws_sqs.py
     homeassistant/components/notify/free_mobile.py
     homeassistant/components/notify/gntp.py
-    homeassistant/components/notify/googlevoice.py
     homeassistant/components/notify/instapush.py
+    homeassistant/components/notify/joaoapps_join.py
     homeassistant/components/notify/message_bird.py
     homeassistant/components/notify/nma.py
     homeassistant/components/notify/pushbullet.py
@@ -169,20 +198,27 @@ omit =
     homeassistant/components/sensor/dte_energy_bridge.py
     homeassistant/components/sensor/efergy.py
     homeassistant/components/sensor/eliqonline.py
+    homeassistant/components/sensor/fastdotcom.py
     homeassistant/components/sensor/fitbit.py
+    homeassistant/components/sensor/fixer.py
     homeassistant/components/sensor/forecast.py
     homeassistant/components/sensor/glances.py
     homeassistant/components/sensor/google_travel_time.py
+    homeassistant/components/sensor/gpsd.py
     homeassistant/components/sensor/gtfs.py
+    homeassistant/components/sensor/imap.py
     homeassistant/components/sensor/lastfm.py
     homeassistant/components/sensor/loopenergy.py
     homeassistant/components/sensor/neurio_energy.py
     homeassistant/components/sensor/nzbget.py
+    homeassistant/components/sensor/ohmconnect.py
     homeassistant/components/sensor/onewire.py
+    homeassistant/components/sensor/openexchangerates.py
     homeassistant/components/sensor/openweathermap.py
     homeassistant/components/sensor/plex.py
     homeassistant/components/sensor/rest.py
     homeassistant/components/sensor/sabnzbd.py
+    homeassistant/components/sensor/serial_pm.py
     homeassistant/components/sensor/snmp.py
     homeassistant/components/sensor/speedtest.py
     homeassistant/components/sensor/steam_online.py
@@ -197,6 +233,7 @@ omit =
     homeassistant/components/sensor/twitch.py
     homeassistant/components/sensor/uber.py
     homeassistant/components/sensor/worldclock.py
+    homeassistant/components/sensor/yweather.py
     homeassistant/components/switch/acer_projector.py
     homeassistant/components/switch/arest.py
     homeassistant/components/switch/dlink.py
@@ -208,6 +245,7 @@ omit =
     homeassistant/components/switch/pulseaudio_loopback.py
     homeassistant/components/switch/rest.py
     homeassistant/components/switch/rpi_rf.py
+    homeassistant/components/switch/tplink.py
     homeassistant/components/switch/transmission.py
     homeassistant/components/switch/wake_on_lan.py
     homeassistant/components/thermostat/eq3btsmart.py

.dockerignore

@@ -0,0 +1,2 @@
+.tox
+.git

.github/PULL_REQUEST_TEMPLATE.md

@@ -15,7 +15,7 @@
 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:
+If code communicates with devices, web services, or a:
   - [ ] 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]).
   - [ ] New dependencies are only imported inside functions that use them ([example][ex-import]).
@@ -26,8 +26,5 @@ If the code does not interact with devices:
   - [ ] Local tests with `tox` run successfully. **Your PR cannot be merged unless tests pass**
   - [ ] Tests have been added to verify that the new code works.
 
-[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/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
-

.gitignore

@@ -7,9 +7,12 @@ config/custom_components/*
 !config/custom_components/example.py
 !config/custom_components/hello_world.py
 !config/custom_components/mqtt_example.py
+!config/panels
+config/panels/*
+!config/panels/react.html
 
-tests/config/deps
-tests/config/home-assistant.log
+tests/testing_config/deps
+tests/testing_config/home-assistant.log
 
 # Hide sublime text stuff
 *.sublime-project
@@ -51,7 +54,8 @@ develop-eggs
 lib
 lib64
 
-# Installer logs
+# Logs
+*.log
 pip-log.txt
 
 # Unit test / coverage reports
@@ -90,3 +94,6 @@ ctags.tmp
 virtualization/vagrant/setup_done
 virtualization/vagrant/.vagrant
 virtualization/vagrant/config
+
+# Visual Studio Code
+.vscode

.travis.yml

@@ -8,8 +8,13 @@ matrix:
       env: TOXENV=requirements
     - python: "3.5"
       env: TOXENV=lint
+    - python: "3.5"
+      env: TOXENV=typing
     - python: "3.5"
       env: TOXENV=py35
+  allow_failures:
+    - python: "3.5"
+      env: TOXENV=typing
 cache:
   directories:
     - $HOME/.cache/pip

CONTRIBUTING.md

@@ -9,79 +9,5 @@ The process is straight-forward.
  - Ensure tests work.
  - 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. 
+Still interested? Then you should take a peak at the [developer documentation](https://home-assistant.io/developers/) to get more details. 
 
-## Adding support for a new device
-
-For help on building your component, please see the [developer documentation](https://home-assistant.io/developers/) on [home-assistant.io](https://home-assistant.io/).
-
-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/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/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/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 `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
-
-It is the responsibility of the component to maintain the states of the devices in your domain. Each device should be a single state and, if possible, a group should be provided that tracks the combined state of the devices.
-
-A state can have several attributes that will help the frontend in displaying your state:
-
- - `friendly_name`: this name will be used as the name of the device
- - `entity_picture`: this picture will be shown instead of the domain icon
- - `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/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/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
-self.hidden = True
-```
-
-This will SUGGEST that the active frontend hides the entity. This requires that the active frontend support hidden cards (the default frontend does) and that the value of hidden be included in your attributes dictionary (see above). The Entity abstract class will take care of this for you.
-
-Remember: The suggestion set by your component's code will always be overwritten by user settings in the configuration.yaml file. This is why you may set hidden to be False, but the property may remain True (or vice-versa).
-
-### Working on the frontend
-
-The frontend is composed of [Polymer](https://www.polymer-project.org) web-components and compiled into the file `frontend.html`. During development you do not want to work with the compiled version but with the seperate files. To have Home Assistant serve the seperate files, set `development=1` for the *http-component* in your config.
-
-When you are done with development and ready to commit your changes, run `build_frontend`, set `development=0` in your config and validate that everything still works.
-
-## Testing your code
-
-To test your code before submission, used the `tox` tool.
-
-```bash
-> pip install -U tox
-> tox
-```
-
-This will run unit tests against python 3.4 and 3.5 (if both are available locally), as well as run a set of tests which validate `pep8` and `pylint` style of the code.
-
-You can optionally run tests on only one tox target using the `-e` option to select an environment.
-
-For instance `tox -e lint` will run the linters only, `tox -e py34` will run unit tests only on python 3.4.
-
-### Notes on PyLint and PEP8 validation
-
-In case a PyLint warning cannot be avoided, add a comment to disable the PyLint check for that line. This can be done using the format `# pylint: disable=YOUR-ERROR-NAME`. Example of an unavoidable PyLint warning is if you do not use the passed in datetime if you're listening for time change.

Dockerfile

@@ -20,7 +20,8 @@ RUN script/build_python_openzwave && \
 
 COPY requirements_all.txt requirements_all.txt
 # certifi breaks Debian based installs
-RUN pip3 install --no-cache-dir -r requirements_all.txt && pip3 uninstall -y certifi
+RUN pip3 install --no-cache-dir -r requirements_all.txt && pip3 uninstall -y certifi && \
+    pip3 install mysqlclient psycopg2
 
 # Copy source
 COPY . .

README.rst

@@ -18,7 +18,7 @@ tutorials and documentation.
 
 |screenshot-states|
 
-Examples of devices it can interface it:
+Examples of devices Home Assistant can interface with:
 
 -  Monitoring connected devices to a wireless router:
    `OpenWrt <https://openwrt.org/>`__,
@@ -61,13 +61,13 @@ Examples of devices it can interface it:
 -  `See full list of supported
    devices <https://home-assistant.io/components/>`__
 
-Built home automation on top of your devices:
+Build home automation on top of your devices:
 
 -  Keep a precise history of every change to the state of your house
--  Turn on the lights when people get home after sun set
--  Turn on lights slowly during sun set to compensate for less light
+-  Turn on the lights when people get home after sunset
+-  Turn on lights slowly during sunset to compensate for less light
 -  Turn off all lights and devices when everybody leaves the house
--  Offers a `REST API <https://home-assistant.io/developers/api/>`__
+-  Offers a `REST API <https://home-assistant.io/developers/rest_api/>`__
    and can interface with MQTT for easy integration with other projects
    like `OwnTracks <http://owntracks.org/>`__
 -  Allow sending notifications using
@@ -75,10 +75,10 @@ Built home automation on top of your devices:
    (NMA) <http://www.notifymyandroid.com/>`__,
    `PushBullet <https://www.pushbullet.com/>`__,
    `PushOver <https://pushover.net/>`__, `Slack <https://slack.com/>`__,
-   `Telegram <https://telegram.org/>`__, and `Jabber
+   `Telegram <https://telegram.org/>`__, `Join <http://joaoapps.com/join/>`__, and `Jabber
    (XMPP) <http://xmpp.org>`__
 
-The system is built modular so support for other devices or actions can
+The system is built using a modular approach so support for other devices or actions can
 be implemented easily. See also the `section on
 architecture <https://home-assistant.io/developers/architecture/>`__
 and the `section on creating your own

config/configuration.yaml.example

@@ -7,8 +7,11 @@ homeassistant:
   latitude: 32.87336
   longitude: 117.22743
 
-  # C for Celsius, F for Fahrenheit
-  temperature_unit: C
+  # Impacts weather/sunrise data
+  elevation: 665
+
+  # 'metric' for Metric System, 'imperial' for imperial system
+  unit_system: metric
 
   # Pick yours from here:
   # http://en.wikipedia.org/wiki/List_of_tz_database_time_zones
@@ -22,6 +25,9 @@ http:
   # Set to 1 to enable development mode
   # development: 1
 
+# Enable the frontend
+frontend:
+
 light:
 #  platform: hue
 
@@ -30,17 +36,12 @@ wink:
   access_token: 'YOUR_TOKEN'
 
 device_tracker:
-  # The following types are available: ddwrt, netgear, tomato, luci,
-  # and nmap_tracker
+  # The following tracker are available:
+  # https://home-assistant.io/components/#presence-detection
   platform: netgear
   host: 192.168.1.1
   username: admin
   password: PASSWORD
-  # http_id is needed for Tomato routers only
-  # http_id: ABCDEFGHH
-  # For nmap_tracker, only the IP addresses to scan are needed:
-  # hosts: 192.168.1.1/24 # netmask prefix notation or
-  # hosts: 192.168.1.1-255 # address range
 
 chromecast:
 
@@ -71,24 +72,25 @@ device_sun_light_trigger:
 # A comma separated list of states that have to be tracked as a single group
 # Grouped states should share the same type of states (ON/OFF or HOME/NOT_HOME)
 # You can also have groups within groups.
+# https://home-assistant.io/components/group/
 group:
-  Home:
-    - group.living_room
-    - group.kitchen
-  living_room:
-    - light.Bowl
-    - light.Ceiling
-    - light.TV_back_light
-  kitchen:
-    - light.fan_bulb_1
-    - light.fan_bulb_2
-  children:
-   - device_tracker.child_1
-   - device_tracker.child_2
+  default_view:
+    view: yes
+    entities:
+      - group.awesome_people
+      - group.climate
 
-process:
-  # items are which processes to look for: <entity_id>: <search string within ps>
-  xbmc: XBMC.App
+  kitchen:
+    name: Kitchen
+    entities:
+      - switch.kitchen_pin_3
+  upstairs:
+    name: Kids
+    icon: mdi:account-multiple
+    view: yes
+    entities:
+      - input_boolean.notify_home
+      - camera.demo_camera
 
 example:
 
@@ -102,6 +104,7 @@ browser:
 
 keyboard:
 
+# https://home-assistant.io/getting-started/automation/
 automation:
 - alias: 'Rule 1 Light on in the evening'
   trigger:
@@ -123,7 +126,6 @@ automation:
     entity_id: group.living_room
 
 - alias: 'Rule 2 - Away Mode'
-
   trigger:
    - platform: state
      entity_id: group.all_devices
@@ -136,6 +138,14 @@ automation:
 
 # Sensors need to be added into the configuration.yaml as sensor:, sensor 2:, sensor 3:, etc. 
 # Each sensor label should be unique or your sensors might not load correctly.
+# Another way to do is to collect all entries under one "sensor:"
+# sensor:
+#   - platform: mqtt
+#     name: "MQTT Sensor 1"
+#   - platform: mqtt
+#     name: "MQTT Sensor 2"
+#
+# Details: https://home-assistant.io/getting-started/devices/
 
 sensor:
   platform: systemmonitor
@@ -146,14 +156,6 @@ sensor:
       arg: '/home'
     - type: 'disk_use'
       arg: '/home'
-    - type: 'disk_free'
-      arg: '/'
-    - type: 'memory_use_percent'
-    - type: 'memory_use'
-    - type: 'memory_free'
-    - type: 'processor_use'
-    - type: 'process'
-      arg: 'octave-cli'
 
 sensor 2:
   platform: forecast
@@ -163,14 +165,6 @@ sensor 2:
     - precip_type
     - precip_intensity
     - temperature
-    - dew_point
-    - wind_speed
-    - wind_bearing
-    - cloud_cover
-    - humidity
-    - pressure
-    - visibility
-    - ozone
 
 script:
   # Turns on the bedroom lights and then the living room lights 1 minute later

config/panels/react.html

@@ -0,0 +1,432 @@
+<!--
+Custom Home Assistant panel example.
+
+Currently only works in Firefox and Chrome because it uses ES6.
+
+Make sure this file is in <config>/panels/react.html
+
+Add to your configuration.yaml:
+
+panel_custom:
+  - name: react
+    sidebar_title: TodoMVC
+    sidebar_icon: mdi:checkbox-marked-outline
+    config:
+      title: Wow hello!
+-->
+
+<script src="https://fb.me/react-15.2.1.min.js"></script>
+<script src="https://fb.me/react-dom-15.2.1.min.js"></script>
+
+<!-- for development, replace with:
+<script src="https://fb.me/react-15.2.1.js"></script>
+<script src="https://fb.me/react-dom-15.2.1.js"></script>
+-->
+
+<!--
+  CSS taken from ReactJS TodoMVC example by Pete Hunt
+  http://todomvc.com/examples/react/
+-->
+
+<style>
+  .todoapp input[type="checkbox"] {
+    outline: none;
+  }
+
+  .todoapp {
+    background: #fff;
+    margin: 130px 0 40px 0;
+    position: relative;
+    box-shadow: 0 2px 4px 0 rgba(0, 0, 0, 0.2),
+                0 25px 50px 0 rgba(0, 0, 0, 0.1);
+  }
+
+  .todoapp h1 {
+    position: absolute;
+    top: -155px;
+    width: 100%;
+    font-size: 100px;
+    font-weight: 100;
+    text-align: center;
+    color: rgba(175, 47, 47, 0.15);
+    -webkit-text-rendering: optimizeLegibility;
+    -moz-text-rendering: optimizeLegibility;
+    text-rendering: optimizeLegibility;
+  }
+
+  .todoapp .main {
+    position: relative;
+    border-top: 1px solid #e6e6e6;
+  }
+
+  .todoapp .todo-list {
+    margin: 0;
+    padding: 0;
+    list-style: none;
+  }
+
+  .todoapp .todo-list li {
+    position: relative;
+    font-size: 24px;
+    border-bottom: 1px solid #ededed;
+  }
+
+  .todoapp .todo-list li:last-child {
+    border-bottom: none;
+  }
+
+  .todoapp .todo-list li .toggle {
+    text-align: center;
+    width: 40px;
+    /* auto, since non-WebKit browsers doesn't support input styling */
+    height: auto;
+    position: absolute;
+    top: 0;
+    bottom: 0;
+    margin: auto 0;
+    border: none; /* Mobile Safari */
+    -webkit-appearance: none;
+    appearance: none;
+    cursor: pointer;
+  }
+
+  .todoapp .todo-list li .toggle:focus {
+    border-left: 3px solid rgba(175, 47, 47, 0.35);
+  }
+
+  .todoapp .todo-list li .toggle:after {
+    content: url('data:image/svg+xml;utf8,<svg xmlns="http://www.w3.org/2000/svg" width="40" height="40" viewBox="-10 -18 100 135"><circle cx="50" cy="50" r="50" fill="none" stroke="#ededed" stroke-width="3"/></svg>');
+  }
+
+  .todoapp .todo-list li .toggle:checked:after {
+    content: url('data:image/svg+xml;utf8,<svg xmlns="http://www.w3.org/2000/svg" width="40" height="40" viewBox="-10 -18 100 135"><circle cx="50" cy="50" r="50" fill="none" stroke="#bddad5" stroke-width="3"/><path fill="#5dc2af" d="M72 25L42 71 27 56l-4 4 20 20 34-52z"/></svg>');
+  }
+
+  .todoapp .todo-list li label {
+    white-space: pre-line;
+    word-break: break-all;
+    padding: 15px 60px 15px 15px;
+    margin-left: 45px;
+    display: block;
+    line-height: 1.2;
+    transition: color 0.4s;
+  }
+
+  .todoapp .todo-list li.completed label {
+    color: #d9d9d9;
+    text-decoration: line-through;
+  }
+
+  .todoapp .footer {
+    color: #777;
+    padding: 10px 15px;
+    height: 20px;
+    text-align: center;
+    border-top: 1px solid #e6e6e6;
+  }
+
+  .todoapp .footer:before {
+    content: '';
+    position: absolute;
+    right: 0;
+    bottom: 0;
+    left: 0;
+    height: 50px;
+    overflow: hidden;
+    box-shadow: 0 1px 1px rgba(0, 0, 0, 0.2),
+                0 8px 0 -3px #f6f6f6,
+                0 9px 1px -3px rgba(0, 0, 0, 0.2),
+                0 16px 0 -6px #f6f6f6,
+                0 17px 2px -6px rgba(0, 0, 0, 0.2);
+  }
+
+  .todoapp .todo-count {
+    float: left;
+    text-align: left;
+    font-weight: 300;
+  }
+
+  .todoapp .toggle-menu {
+    position: absolute;
+    right: 15px;
+    font-weight: 300;
+    color: rgba(175, 47, 47, 0.75);
+  }
+
+  .todoapp .filters {
+    margin: 0;
+    padding: 0;
+    list-style: none;
+    position: absolute;
+    right: 0;
+    left: 0;
+  }
+
+  .todoapp .filters li {
+    display: inline;
+  }
+
+  .todoapp .filters li a {
+    color: inherit;
+    margin: 3px;
+    padding: 3px 7px;
+    text-decoration: none;
+    border: 1px solid transparent;
+    border-radius: 3px;
+  }
+
+  .todoapp .filters li a.selected,
+  .filters li a:hover {
+    border-color: rgba(175, 47, 47, 0.1);
+  }
+
+  .todoapp .filters li a.selected {
+    border-color: rgba(175, 47, 47, 0.2);
+  }
+
+  /*
+    Hack to remove background from Mobile Safari.
+    Can't use it globally since it destroys checkboxes in Firefox
+  */
+  @media screen and (-webkit-min-device-pixel-ratio:0) {
+    .todoapp .toggle-all,
+    .todoapp .todo-list li .toggle {
+      background: none;
+    }
+
+    .todoapp .todo-list li .toggle {
+      height: 40px;
+    }
+
+    .todoapp .toggle-all {
+      -webkit-transform: rotate(90deg);
+      transform: rotate(90deg);
+      -webkit-appearance: none;
+      appearance: none;
+    }
+  }
+
+  @media (max-width: 430px) {
+    .todoapp .footer {
+      height: 50px;
+    }
+
+    .todoapp .filters {
+      bottom: 10px;
+    }
+  }
+</style>
+
+<dom-module id='ha-panel-react'>
+  <template>
+    <style>
+      :host {
+        background: #f5f5f5;
+        display: block;
+        height: 100%;
+        overflow: auto;
+      }
+      .mount {
+        font: 14px 'Helvetica Neue', Helvetica, Arial, sans-serif;
+        line-height: 1.4em;
+        color: #4d4d4d;
+        min-width: 230px;
+        max-width: 550px;
+        margin: 0 auto;
+        -webkit-font-smoothing: antialiased;
+        -moz-font-smoothing: antialiased;
+        font-smoothing: antialiased;
+        font-weight: 300;
+      }
+    </style>
+    <div id='mount' class='mount'></div>
+  </template>
+</dom-module>
+
+<script>
+// Example uses ES6. Will only work in modern browsers
+class TodoMVC extends React.Component {
+  constructor(props) {
+    super(props);
+
+    this.state = {
+      filter: 'all',
+      // load initial value of entities
+      entities: this.props.hass.reactor.evaluate(
+        this.props.hass.entityGetters.visibleEntityMap),
+    };
+  }
+
+  componentDidMount() {
+    // register to entity updates
+    this._unwatchHass = this.props.hass.reactor.observe(
+      this.props.hass.entityGetters.visibleEntityMap,
+      entities => this.setState({entities}))
+  }
+
+  componentWillUnmount() {
+    // unregister to entity updates
+    this._unwatchHass();
+  }
+
+  handlePickFilter(filter, ev) {
+    ev.preventDefault();
+    this.setState({filter});
+  }
+
+  handleEntityToggle(entity, ev) {
+    this.props.hass.serviceActions.callService(
+      entity.domain, 'toggle', { entity_id: entity.entityId });
+  }
+
+  handleToggleMenu(ev) {
+    ev.preventDefault();
+    Polymer.Base.fire('open-menu', null, {node: ev.target});
+  }
+
+  entityRow(entity) {
+    const completed = entity.state === 'on';
+
+    return React.createElement(
+      'li', {
+        className: completed && 'completed',
+        key: entity.entityId,
+      },
+      React.createElement(
+        "div", { className: "view" },
+        React.createElement(
+          "input", {
+            checked: completed,
+            className: "toggle",
+            type: "checkbox",
+            onChange: ev => this.handleEntityToggle(entity, ev),
+          }),
+        React.createElement("label", null, entity.entityDisplay)));
+  }
+
+  filterRow(filter) {
+    return React.createElement(
+      "li", { key: filter },
+      React.createElement(
+        "a", {
+          href: "#",
+          className: this.state.filter === filter && "selected",
+          onClick: ev => this.handlePickFilter(filter, ev),
+        },
+        filter.substring(0, 1).toUpperCase() + filter.substring(1)
+      )
+    );
+  }
+
+  render() {
+    const { entities, filter } = this.state;
+
+    if (!entities) return null;
+
+    const filters = ['all', 'light', 'switch'];
+
+    const showEntities = filter === 'all' ?
+      entities.filter(ent => filters.includes(ent.domain)) :
+      entities.filter(ent => ent.domain == filter);
+
+    return React.createElement(
+      'div', { className: 'todoapp-wrapper' },
+      React.createElement(
+        "section", { className: "todoapp" },
+        React.createElement(
+          "div", null,
+          React.createElement(
+            "header", { className: "header" },
+            React.createElement("h1", null, this.props.title || "todos")
+          ),
+          React.createElement(
+            "section", { className: "main" },
+            React.createElement(
+              "ul", { className: "todo-list" },
+              showEntities.valueSeq().map(ent => this.entityRow(ent)))
+            )
+          ),
+          React.createElement(
+            "footer", { className: "footer" },
+            React.createElement(
+              "span", { className: "todo-count" },
+              showEntities.filter(ent => ent.state === 'off').size + " items left"
+            ),
+            React.createElement(
+              "ul", { className: "filters" },
+              filters.map(filter => this.filterRow(filter))
+            ),
+            !this.props.showMenu && React.createElement(
+              "a", {
+                className: "toggle-menu",
+                href: '#',
+                onClick: ev => this.handleToggleMenu(ev),
+              },
+              "Show menu"
+            )
+          )
+        ));
+  }
+}
+
+Polymer({
+  is: 'ha-panel-react',
+
+  properties: {
+    // Home Assistant object
+    hass: {
+      type: Object,
+    },
+
+    // If should render in narrow mode
+    narrow: {
+      type: Boolean,
+      value: false,
+    },
+
+    // If sidebar is currently shown
+    showMenu: {
+      type: Boolean,
+      value: false,
+    },
+
+    // Home Assistant panel info
+    // panel.config contains config passed to register_panel serverside
+    panel: {
+      type: Object,
+    }
+  },
+
+  // This will make sure we forward changed properties to React
+  observers: [
+    'propsChanged(hass, narrow, showMenu, panel)',
+  ],
+
+  // Mount React when element attached
+  attached: function () {
+    this.mount(this.hass, this.narrow, this.showMenu, this.panel);
+  },
+
+  // Called when properties change
+  propsChanged: function (hass, narrow, showMenu, panel) {
+    this.mount(hass, narrow, showMenu, panel);
+  },
+
+  // Render React. Debounce in case multiple properties change.
+  mount: function (hass, narrow, showMenu, panel) {
+    this.debounce('mount', function () {
+      ReactDOM.render(React.createElement(TodoMVC, {
+        hass: hass,
+        narrow: narrow,
+        showMenu: showMenu,
+        title: panel.config ? panel.config.title : null
+      }), this.$.mount);
+    }.bind(this));
+  },
+
+  // Unmount React node when panel no longer in use.
+  detached: function () {
+    ReactDOM.unmountComponentAtNode(this.$.mount);
+  },
+});
+</script>

docs/swagger.yaml

@@ -419,8 +419,9 @@ definitions:
         description: Longitude of Home Assistant server
       location_name:
         type: string
-      temperature_unit:
+      unit_system:
         type: string
+        description: The system for measurement units
       time_zone:
         type: string
       version:

homeassistant/__main__.py

@@ -7,7 +7,8 @@ import platform
 import subprocess
 import sys
 import threading
-import time
+
+from typing import Optional, List
 
 from homeassistant.const import (
     __version__,
@@ -17,7 +18,7 @@ from homeassistant.const import (
 )
 
 
-def validate_python():
+def validate_python() -> None:
     """Validate we're running the right Python version."""
     major, minor = sys.version_info[:2]
     req_major, req_minor = REQUIRED_PYTHON_VER
@@ -28,7 +29,7 @@ def validate_python():
         sys.exit(1)
 
 
-def ensure_config_path(config_dir):
+def ensure_config_path(config_dir: str) -> None:
     """Validate the configuration directory."""
     import homeassistant.config as config_util
     lib_dir = os.path.join(config_dir, 'deps')
@@ -57,7 +58,7 @@ def ensure_config_path(config_dir):
             sys.exit(1)
 
 
-def ensure_config_file(config_dir):
+def ensure_config_file(config_dir: str) -> str:
     """Ensure configuration file exists."""
     import homeassistant.config as config_util
     config_path = config_util.ensure_config_exists(config_dir)
@@ -69,7 +70,7 @@ def ensure_config_file(config_dir):
     return config_path
 
 
-def get_arguments():
+def get_arguments() -> argparse.Namespace:
     """Get parsed passed in arguments."""
     import homeassistant.config as config_util
     parser = argparse.ArgumentParser(
@@ -110,22 +111,14 @@ def get_arguments():
         type=int,
         default=None,
         help='Enables daily log rotation and keeps up to the specified days')
-    parser.add_argument(
-        '--install-osx',
-        action='store_true',
-        help='Installs as a service on OS X and loads on boot.')
-    parser.add_argument(
-        '--uninstall-osx',
-        action='store_true',
-        help='Uninstalls from OS X.')
-    parser.add_argument(
-        '--restart-osx',
-        action='store_true',
-        help='Restarts on OS X.')
     parser.add_argument(
         '--runner',
         action='store_true',
         help='On restart exit with code {}'.format(RESTART_EXIT_CODE))
+    parser.add_argument(
+        '--script',
+        nargs=argparse.REMAINDER,
+        help='Run one of the embedded scripts')
     if os.name == "posix":
         parser.add_argument(
             '--daemon',
@@ -134,12 +127,12 @@ def get_arguments():
 
     arguments = parser.parse_args()
     if os.name != "posix" or arguments.debug or arguments.runner:
-        arguments.daemon = False
+        setattr(arguments, 'daemon', False)
 
     return arguments
 
 
-def daemonize():
+def daemonize() -> None:
     """Move current process to daemon process."""
     # Create first fork
     pid = os.fork()
@@ -164,7 +157,7 @@ def daemonize():
     os.dup2(outfd.fileno(), sys.stderr.fileno())
 
 
-def check_pid(pid_file):
+def check_pid(pid_file: str) -> None:
     """Check that HA is not already running."""
     # Check pid file
     try:
@@ -186,7 +179,7 @@ def check_pid(pid_file):
     sys.exit(1)
 
 
-def write_pid(pid_file):
+def write_pid(pid_file: str) -> None:
     """Create a PID File."""
     pid = os.getpid()
     try:
@@ -196,47 +189,7 @@ def write_pid(pid_file):
         sys.exit(1)
 
 
-def install_osx():
-    """Setup to run via launchd on OS X."""
-    with os.popen('which hass') as inp:
-        hass_path = inp.read().strip()
-
-    with os.popen('whoami') as inp:
-        user = inp.read().strip()
-
-    cwd = os.path.dirname(__file__)
-    template_path = os.path.join(cwd, 'startup', 'launchd.plist')
-
-    with open(template_path, 'r', encoding='utf-8') as inp:
-        plist = inp.read()
-
-    plist = plist.replace("$HASS_PATH$", hass_path)
-    plist = plist.replace("$USER$", user)
-
-    path = os.path.expanduser("~/Library/LaunchAgents/org.homeassistant.plist")
-
-    try:
-        with open(path, 'w', encoding='utf-8') as outp:
-            outp.write(plist)
-    except IOError as err:
-        print('Unable to write to ' + path, err)
-        return
-
-    os.popen('launchctl load -w -F ' + path)
-
-    print("Home Assistant has been installed. \
-        Open it here: http://localhost:8123")
-
-
-def uninstall_osx():
-    """Unload from launchd on OS X."""
-    path = os.path.expanduser("~/Library/LaunchAgents/org.homeassistant.plist")
-    os.popen('launchctl unload ' + path)
-
-    print("Home Assistant has been uninstalled.")
-
-
-def closefds_osx(min_fd, max_fd):
+def closefds_osx(min_fd: int, max_fd: int) -> None:
     """Make sure file descriptors get closed when we restart.
 
     We cannot call close on guarded fds, and we cannot easily test which fds
@@ -254,7 +207,7 @@ def closefds_osx(min_fd, max_fd):
             pass
 
 
-def cmdline():
+def cmdline() -> List[str]:
     """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])
@@ -262,16 +215,17 @@ def cmdline():
     return [sys.executable] + [arg for arg in sys.argv if arg != '--daemon']
 
 
-def setup_and_run_hass(config_dir, args):
+def setup_and_run_hass(config_dir: str,
+                       args: argparse.Namespace) -> Optional[int]:
     """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']
+        nt_args = cmdline() + ['--runner']
         while True:
             try:
-                subprocess.check_call(args)
+                subprocess.check_call(nt_args)
                 sys.exit(0)
             except subprocess.CalledProcessError as exc:
                 if exc.returncode != RESTART_EXIT_CODE:
@@ -293,7 +247,7 @@ def setup_and_run_hass(config_dir, args):
             log_rotate_days=args.log_rotate_days)
 
     if hass is None:
-        return
+        return None
 
     if args.open_ui:
         def open_browser(event):
@@ -310,7 +264,7 @@ def setup_and_run_hass(config_dir, args):
     return exit_code
 
 
-def try_to_restart():
+def try_to_restart() -> None:
     """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.
@@ -320,7 +274,7 @@ def try_to_restart():
     # thread left (which is us). Nothing we really do with it, but it might be
     # useful when debugging shutdown/restart issues.
     try:
-        nthreads = sum(thread.isAlive() and not thread.isDaemon()
+        nthreads = sum(thread.is_alive() and not thread.daemon
                        for thread in threading.enumerate())
         if nthreads > 1:
             sys.stderr.write(
@@ -352,29 +306,19 @@ def try_to_restart():
     os.execv(args[0], args)
 
 
-def main():
+def main() -> int:
     """Start Home Assistant."""
     validate_python()
 
     args = get_arguments()
 
+    if args.script is not None:
+        from homeassistant import scripts
+        return scripts.run(args.script)
+
     config_dir = os.path.join(os.getcwd(), args.config)
     ensure_config_path(config_dir)
 
-    # OS X launchd functions
-    if args.install_osx:
-        install_osx()
-        return 0
-    if args.uninstall_osx:
-        uninstall_osx()
-        return 0
-    if args.restart_osx:
-        uninstall_osx()
-        # A small delay is needed on some systems to let the unload finish.
-        time.sleep(0.5)
-        install_osx()
-        return 0
-
     # Daemon functions
     if args.pid_file:
         check_pid(args.pid_file)

homeassistant/bootstrap.py

@@ -3,30 +3,26 @@
 import logging
 import logging.handlers
 import os
-import shutil
 import sys
 from collections import defaultdict
 from threading import RLock
 
+from types import ModuleType
+from typing import Any, Optional, Dict
+
 import voluptuous as vol
+from voluptuous.humanize import humanize_error
 
 import homeassistant.components as core_components
-import homeassistant.components.group as group
-import homeassistant.config as config_util
+from homeassistant.components import group, persistent_notification
+import homeassistant.config as conf_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
 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_CELSIUS, TEMP_FAHRENHEIT, PLATFORM_FORMAT, __version__)
+from homeassistant.const import EVENT_COMPONENT_LOADED, PLATFORM_FORMAT
 from homeassistant.exceptions import HomeAssistantError
 from homeassistant.helpers import (
     event_decorators, service, config_per_platform, extract_domain_configs)
-from homeassistant.helpers.entity import Entity
 
 _LOGGER = logging.getLogger(__name__)
 _SETUP_LOCK = RLock()
@@ -37,7 +33,8 @@ ATTR_COMPONENT = 'component'
 ERROR_LOG_FILENAME = 'home-assistant.log'
 
 
-def setup_component(hass, domain, config=None):
+def setup_component(hass: core.HomeAssistant, domain: str,
+                    config: Optional[Dict]=None) -> bool:
     """Setup a component and all its dependencies."""
     if domain in hass.config.components:
         return True
@@ -60,7 +57,8 @@ def setup_component(hass, domain, config=None):
     return True
 
 
-def _handle_requirements(hass, component, name):
+def _handle_requirements(hass: core.HomeAssistant, component,
+                         name: str) -> bool:
     """Install the requirements for a component."""
     if hass.config.skip_pip or not hasattr(component, 'REQUIREMENTS'):
         return True
@@ -74,9 +72,10 @@ def _handle_requirements(hass, component, name):
     return True
 
 
-def _setup_component(hass, domain, config):
+def _setup_component(hass: core.HomeAssistant, domain: str, config) -> bool:
     """Setup a component for Home Assistant."""
     # pylint: disable=too-many-return-statements,too-many-branches
+    # pylint: disable=too-many-statements
     if domain in hass.config.components:
         return True
 
@@ -104,7 +103,7 @@ def _setup_component(hass, domain, config):
             try:
                 config = component.CONFIG_SCHEMA(config)
             except vol.MultipleInvalid as ex:
-                cv.log_exception(_LOGGER, ex, domain, config)
+                _log_exception(ex, domain, config)
                 return False
 
         elif hasattr(component, 'PLATFORM_SCHEMA'):
@@ -114,7 +113,7 @@ def _setup_component(hass, domain, config):
                 try:
                     p_validated = component.PLATFORM_SCHEMA(p_config)
                 except vol.MultipleInvalid as ex:
-                    cv.log_exception(_LOGGER, ex, domain, p_config)
+                    _log_exception(ex, domain, p_config)
                     return False
 
                 # Not all platform components follow same pattern for platforms
@@ -135,8 +134,8 @@ def _setup_component(hass, domain, config):
                     try:
                         p_validated = platform.PLATFORM_SCHEMA(p_validated)
                     except vol.MultipleInvalid as ex:
-                        cv.log_exception(_LOGGER, ex, '{}.{}'
-                                         .format(domain, p_name), p_validated)
+                        _log_exception(ex, '{}.{}'.format(domain, p_name),
+                                       p_validated)
                         return False
 
                 platforms.append(p_validated)
@@ -154,9 +153,15 @@ def _setup_component(hass, domain, config):
         _CURRENT_SETUP.append(domain)
 
         try:
-            if not component.setup(hass, config):
+            result = component.setup(hass, config)
+            if result is False:
                 _LOGGER.error('component %s failed to initialize', domain)
                 return False
+            elif result is not True:
+                _LOGGER.error('component %s did not return boolean if setup '
+                              'was successful. Disabling component.', domain)
+                loader.set_component(domain, None)
+                return False
         except Exception:  # pylint: disable=broad-except
             _LOGGER.exception('Error during setup of component %s', domain)
             return False
@@ -176,7 +181,8 @@ def _setup_component(hass, domain, config):
         return True
 
 
-def prepare_setup_platform(hass, config, domain, platform_name):
+def prepare_setup_platform(hass: core.HomeAssistant, config, domain: str,
+                           platform_name: str) -> Optional[ModuleType]:
     """Load a platform and makes sure dependencies are setup."""
     _ensure_loader_prepared(hass)
 
@@ -208,15 +214,15 @@ def prepare_setup_platform(hass, config, domain, platform_name):
     return platform
 
 
-def mount_local_lib_path(config_dir):
-    """Add local library to Python Path."""
-    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, skip_pip=False,
-                     log_rotate_days=None):
+def from_config_dict(config: Dict[str, Any],
+                     hass: Optional[core.HomeAssistant]=None,
+                     config_dir: Optional[str]=None,
+                     enable_log: bool=True,
+                     verbose: bool=False,
+                     skip_pip: bool=False,
+                     log_rotate_days: Any=None) \
+                     -> Optional[core.HomeAssistant]:
     """Try to configure Home Assistant from a config dict.
 
     Dynamically loads required components and its dependencies.
@@ -231,13 +237,12 @@ def from_config_dict(config, hass=None, config_dir=None, enable_log=True,
     core_config = config.get(core.DOMAIN, {})
 
     try:
-        process_ha_core_config(hass, config_util.CORE_CONFIG_SCHEMA(
-            core_config))
-    except vol.MultipleInvalid as ex:
-        cv.log_exception(_LOGGER, ex, 'homeassistant', core_config)
+        conf_util.process_ha_core_config(hass, core_config)
+    except vol.Invalid as ex:
+        _log_exception(ex, 'homeassistant', core_config)
         return None
 
-    process_ha_config_upgrade(hass)
+    conf_util.process_ha_config_upgrade(hass)
 
     if enable_log:
         enable_logging(hass, verbose, log_rotate_days)
@@ -262,9 +267,10 @@ def from_config_dict(config, hass=None, config_dir=None, enable_log=True,
     if not core_components.setup(hass, config):
         _LOGGER.error('Home Assistant core failed to initialize. '
                       'Further initialization aborted.')
-
         return hass
 
+    persistent_notification.setup(hass, config)
+
     _LOGGER.info('Home Assistant core initialized')
 
     # Give event decorators access to HASS
@@ -278,8 +284,11 @@ 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, skip_pip=True,
-                     log_rotate_days=None):
+def from_config_file(config_path: str,
+                     hass: Optional[core.HomeAssistant]=None,
+                     verbose: bool=False,
+                     skip_pip: bool=True,
+                     log_rotate_days: Any=None):
     """Read the configuration file and try to start all the functionality.
 
     Will add functionality to 'hass' parameter if given,
@@ -296,7 +305,7 @@ def from_config_file(config_path, hass=None, verbose=False, skip_pip=True,
     enable_logging(hass, verbose, log_rotate_days)
 
     try:
-        config_dict = config_util.load_yaml_config_file(config_path)
+        config_dict = conf_util.load_yaml_config_file(config_path)
     except HomeAssistantError:
         return None
 
@@ -304,7 +313,8 @@ def from_config_file(config_path, hass=None, verbose=False, skip_pip=True,
                             skip_pip=skip_pip)
 
 
-def enable_logging(hass, verbose=False, log_rotate_days=None):
+def enable_logging(hass: core.HomeAssistant, verbose: bool=False,
+                   log_rotate_days=None) -> None:
     """Setup the logging."""
     logging.basicConfig(level=logging.INFO)
     fmt = ("%(log_color)s%(asctime)s %(levelname)s (%(threadName)s) "
@@ -355,101 +365,32 @@ def enable_logging(hass, verbose=False, log_rotate_days=None):
             'Unable to setup error log %s (access denied)', err_log_path)
 
 
-def process_ha_config_upgrade(hass):
-    """Upgrade config if necessary."""
-    version_path = hass.config.path('.HA_VERSION')
-
-    try:
-        with open(version_path, 'rt') as inp:
-            conf_version = inp.readline().strip()
-    except FileNotFoundError:
-        # Last version to not have this file
-        conf_version = '0.7.7'
-
-    if conf_version == __version__:
-        return
-
-    _LOGGER.info('Upgrading config directory from %s to %s', conf_version,
-                 __version__)
-
-    # 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__)
-
-
-def process_ha_core_config(hass, config):
-    """Process the [homeassistant] section from the config."""
-    hac = hass.config
-
-    def set_time_zone(time_zone_str):
-        """Helper method to set time zone."""
-        if time_zone_str is None:
-            return
-
-        time_zone = date_util.get_time_zone(time_zone_str)
-
-        if time_zone:
-            hac.time_zone = time_zone
-            date_util.set_default_time_zone(time_zone)
-        else:
-            _LOGGER.error('Received invalid time zone %s', time_zone_str)
-
-    for key, attr in ((CONF_LATITUDE, 'latitude'),
-                      (CONF_LONGITUDE, 'longitude'),
-                      (CONF_NAME, 'location_name')):
-        if key in config:
-            setattr(hac, attr, config[key])
-
-    if CONF_TIME_ZONE in config:
-        set_time_zone(config.get(CONF_TIME_ZONE))
-
-    for entity_id, attrs in config.get(CONF_CUSTOMIZE).items():
-        Entity.overwrite_attribute(entity_id, attrs.keys(), attrs.values())
-
-    if CONF_TEMPERATURE_UNIT in config:
-        hac.temperature_unit = config[CONF_TEMPERATURE_UNIT]
-
-    # If we miss some of the needed values, auto detect them
-    if None not in (
-            hac.latitude, hac.longitude, hac.temperature_unit, hac.time_zone):
-        return
-
-    _LOGGER.warning('Incomplete core config. Auto detecting location and '
-                    'temperature unit')
-
-    info = loc_util.detect_location_info()
-
-    if info is None:
-        _LOGGER.error('Could not detect location information')
-        return
-
-    if hac.latitude is None and hac.longitude is None:
-        hac.latitude = info.latitude
-        hac.longitude = info.longitude
-
-    if hac.temperature_unit is None:
-        if info.use_fahrenheit:
-            hac.temperature_unit = TEMP_FAHRENHEIT
-        else:
-            hac.temperature_unit = TEMP_CELSIUS
-
-    if hac.location_name is None:
-        hac.location_name = info.city
-
-    if hac.time_zone is None:
-        set_time_zone(info.time_zone)
-
-
-def _ensure_loader_prepared(hass):
+def _ensure_loader_prepared(hass: core.HomeAssistant) -> None:
     """Ensure Home Assistant loader is prepared."""
     if not loader.PREPARED:
         loader.prepare(hass)
+
+
+def _log_exception(ex, domain, config):
+    """Generate log exception for config validation."""
+    message = 'Invalid config for [{}]: '.format(domain)
+    if 'extra keys not allowed' in ex.error_message:
+        message += '[{}] is an invalid option for [{}]. Check: {}->{}.'\
+                   .format(ex.path[-1], domain, domain,
+                           '->'.join('%s' % m for m in ex.path))
+    else:
+        message += humanize_error(config, ex)
+
+    if hasattr(config, '__line__'):
+        message += " (See {}:{})".format(config.__config_file__,
+                                         config.__line__ or '?')
+
+    _LOGGER.error(message)
+
+
+def mount_local_lib_path(config_dir: str) -> str:
+    """Add local library to Python Path."""
+    deps_dir = os.path.join(config_dir, 'deps')
+    if deps_dir not in sys.path:
+        sys.path.insert(0, os.path.join(config_dir, 'deps'))
+    return deps_dir

homeassistant/components/__init__.py

@@ -11,7 +11,6 @@ import itertools as it
 import logging
 
 import homeassistant.core as ha
-from homeassistant.helpers.entity import split_entity_id
 from homeassistant.helpers.service import extract_entity_ids
 from homeassistant.loader import get_component
 from homeassistant.const import (
@@ -19,6 +18,8 @@ from homeassistant.const import (
 
 _LOGGER = logging.getLogger(__name__)
 
+SERVICE_RELOAD_CORE_CONFIG = 'reload_core_config'
+
 
 def is_on(hass, entity_id=None):
     """Load up the module to call the is_on method.
@@ -33,7 +34,7 @@ def is_on(hass, entity_id=None):
         entity_ids = hass.states.entity_ids()
 
     for entity_id in entity_ids:
-        domain = split_entity_id(entity_id)[0]
+        domain = ha.split_entity_id(entity_id)[0]
 
         module = get_component(domain)
 
@@ -73,6 +74,11 @@ def toggle(hass, entity_id=None, **service_data):
     hass.services.call(ha.DOMAIN, SERVICE_TOGGLE, service_data)
 
 
+def reload_core_config(hass):
+    """Reload the core config."""
+    hass.services.call(ha.DOMAIN, SERVICE_RELOAD_CORE_CONFIG)
+
+
 def setup(hass, config):
     """Setup general services related to Home Assistant."""
     def handle_turn_service(service):
@@ -88,7 +94,7 @@ def setup(hass, config):
 
         # Group entity_ids by domain. groupby requires sorted data.
         by_domain = it.groupby(sorted(entity_ids),
-                               lambda item: split_entity_id(item)[0])
+                               lambda item: ha.split_entity_id(item)[0])
 
         for domain, ent_ids in by_domain:
             # We want to block for all calls and only return when all calls
@@ -111,4 +117,21 @@ def setup(hass, config):
     hass.services.register(ha.DOMAIN, SERVICE_TURN_ON, handle_turn_service)
     hass.services.register(ha.DOMAIN, SERVICE_TOGGLE, handle_turn_service)
 
+    def handle_reload_config(call):
+        """Service handler for reloading core config."""
+        from homeassistant.exceptions import HomeAssistantError
+        from homeassistant import config as conf_util
+
+        try:
+            path = conf_util.find_config_file(hass.config.config_dir)
+            conf = conf_util.load_yaml_config_file(path)
+        except HomeAssistantError as err:
+            _LOGGER.error(err)
+            return
+
+        conf_util.process_ha_core_config(hass, conf.get(ha.DOMAIN) or {})
+
+    hass.services.register(ha.DOMAIN, SERVICE_RELOAD_CORE_CONFIG,
+                           handle_reload_config)
+
     return True

homeassistant/components/alarm_control_panel/__init__.py

@@ -20,6 +20,7 @@ from homeassistant.helpers.entity_component import EntityComponent
 
 DOMAIN = 'alarm_control_panel'
 SCAN_INTERVAL = 30
+ATTR_CHANGED_BY = 'changed_by'
 
 ENTITY_ID_FORMAT = DOMAIN + '.{}'
 
@@ -124,6 +125,11 @@ class AlarmControlPanel(Entity):
         """Regex for code format or None if no code is required."""
         return None
 
+    @property
+    def changed_by(self):
+        """Last change triggered by."""
+        return None
+
     def alarm_disarm(self, code=None):
         """Send disarm command."""
         raise NotImplementedError()
@@ -145,5 +151,6 @@ class AlarmControlPanel(Entity):
         """Return the state attributes."""
         state_attr = {
             ATTR_CODE_FORMAT: self.code_format,
+            ATTR_CHANGED_BY: self.changed_by
         }
         return state_attr

homeassistant/components/alarm_control_panel/envisalink.py

@@ -0,0 +1,105 @@
+"""
+Support for Envisalink-based alarm control panels (Honeywell/DSC).
+
+For more details about this platform, please refer to the documentation at
+https://home-assistant.io/components/alarm_control_panel.envisalink/
+"""
+import logging
+import homeassistant.components.alarm_control_panel as alarm
+from homeassistant.components.envisalink import (EVL_CONTROLLER,
+                                                 EnvisalinkDevice,
+                                                 PARTITION_SCHEMA,
+                                                 CONF_CODE,
+                                                 CONF_PARTITIONNAME,
+                                                 SIGNAL_PARTITION_UPDATE,
+                                                 SIGNAL_KEYPAD_UPDATE)
+from homeassistant.const import (
+    STATE_ALARM_ARMED_AWAY, STATE_ALARM_ARMED_HOME, STATE_ALARM_DISARMED,
+    STATE_UNKNOWN, STATE_ALARM_TRIGGERED)
+
+DEPENDENCIES = ['envisalink']
+_LOGGER = logging.getLogger(__name__)
+
+
+# pylint: disable=unused-argument
+def setup_platform(hass, config, add_devices_callback, discovery_info=None):
+    """Perform the setup for Envisalink alarm panels."""
+    _configured_partitions = discovery_info['partitions']
+    _code = discovery_info[CONF_CODE]
+    for part_num in _configured_partitions:
+        _device_config_data = PARTITION_SCHEMA(
+            _configured_partitions[part_num])
+        _device = EnvisalinkAlarm(
+            part_num,
+            _device_config_data[CONF_PARTITIONNAME],
+            _code,
+            EVL_CONTROLLER.alarm_state['partition'][part_num],
+            EVL_CONTROLLER)
+        add_devices_callback([_device])
+
+    return True
+
+
+class EnvisalinkAlarm(EnvisalinkDevice, alarm.AlarmControlPanel):
+    """Represents the Envisalink-based alarm panel."""
+
+    # pylint: disable=too-many-arguments
+    def __init__(self, partition_number, alarm_name, code, info, controller):
+        """Initialize the alarm panel."""
+        from pydispatch import dispatcher
+        self._partition_number = partition_number
+        self._code = code
+        _LOGGER.debug('Setting up alarm: ' + alarm_name)
+        EnvisalinkDevice.__init__(self, alarm_name, info, controller)
+        dispatcher.connect(self._update_callback,
+                           signal=SIGNAL_PARTITION_UPDATE,
+                           sender=dispatcher.Any)
+        dispatcher.connect(self._update_callback,
+                           signal=SIGNAL_KEYPAD_UPDATE,
+                           sender=dispatcher.Any)
+
+    def _update_callback(self, partition):
+        """Update HA state, if needed."""
+        if partition is None or int(partition) == self._partition_number:
+            self.update_ha_state()
+
+    @property
+    def code_format(self):
+        """The characters if code is defined."""
+        return self._code
+
+    @property
+    def state(self):
+        """Return the state of the device."""
+        if self._info['status']['alarm']:
+            return STATE_ALARM_TRIGGERED
+        elif self._info['status']['armed_away']:
+            return STATE_ALARM_ARMED_AWAY
+        elif self._info['status']['armed_stay']:
+            return STATE_ALARM_ARMED_HOME
+        elif self._info['status']['alpha']:
+            return STATE_ALARM_DISARMED
+        else:
+            return STATE_UNKNOWN
+
+    def alarm_disarm(self, code=None):
+        """Send disarm command."""
+        if self._code:
+            EVL_CONTROLLER.disarm_partition(str(code),
+                                            self._partition_number)
+
+    def alarm_arm_home(self, code=None):
+        """Send arm home command."""
+        if self._code:
+            EVL_CONTROLLER.arm_stay_partition(str(code),
+                                              self._partition_number)
+
+    def alarm_arm_away(self, code=None):
+        """Send arm away command."""
+        if self._code:
+            EVL_CONTROLLER.arm_away_partition(str(code),
+                                              self._partition_number)
+
+    def alarm_trigger(self, code=None):
+        """Alarm trigger command. Not possible for us."""
+        raise NotImplementedError()

homeassistant/components/alarm_control_panel/services.yaml

@@ -0,0 +1,43 @@
+alarm_disarm:
+  description: Send the alarm the command for disarm
+
+  fields:
+    entity_id:
+      description: Name of alarm control panel to disarm
+      example: 'alarm_control_panel.downstairs'
+    code:
+      description: An optional code to disarm the alarm control panel with
+      example: 1234
+
+alarm_arm_home:
+  description: Send the alarm the command for arm home
+
+  fields:
+    entity_id:
+      description: Name of alarm control panel to arm home
+      example: 'alarm_control_panel.downstairs'
+    code:
+      description: An optional code to arm home the alarm control panel with
+      example: 1234
+
+alarm_arm_away:
+  description: Send the alarm the command for arm away
+
+  fields:
+    entity_id:
+      description: Name of alarm control panel to arm away
+      example: 'alarm_control_panel.downstairs'
+    code:
+      description: An optional code to arm away the alarm control panel with
+      example: 1234
+
+alarm_trigger:
+  description: Send the alarm the command for trigger
+
+  fields:
+    entity_id:
+      description: Name of alarm control panel to trigger
+      example: 'alarm_control_panel.downstairs'
+    code:
+      description: An optional code to trigger the alarm control panel with
+      example: 1234

homeassistant/components/alarm_control_panel/simplisafe.py

@@ -0,0 +1,124 @@
+"""
+Interfaces with SimpliSafe alarm control panel.
+
+For more details about this platform, please refer to the documentation at
+https://home-assistant.io/components/alarm_control_panel.simplisafe/
+"""
+import logging
+
+import homeassistant.components.alarm_control_panel as alarm
+
+from homeassistant.const import (
+    CONF_PASSWORD, CONF_USERNAME, STATE_UNKNOWN,
+    STATE_ALARM_DISARMED, STATE_ALARM_ARMED_HOME, STATE_ALARM_ARMED_AWAY)
+
+_LOGGER = logging.getLogger(__name__)
+REQUIREMENTS = ['https://github.com/w1ll1am23/simplisafe-python/archive/'
+                '586fede0e85fd69e56e516aaa8e97eb644ca8866.zip#'
+                'simplisafe-python==0.0.1']
+
+
+def setup_platform(hass, config, add_devices, discovery_info=None):
+    """Set up the SimpliSafe platform."""
+    username = config.get(CONF_USERNAME)
+    password = config.get(CONF_PASSWORD)
+
+    if username is None or password is None:
+        _LOGGER.error('Must specify username and password!')
+        return False
+
+    add_devices([SimpliSafeAlarm(
+        config.get('name', "SimpliSafe"),
+        username,
+        password,
+        config.get('code'))])
+
+
+# pylint: disable=abstract-method
+class SimpliSafeAlarm(alarm.AlarmControlPanel):
+    """Representation a SimpliSafe alarm."""
+
+    def __init__(self, name, username, password, code):
+        """Initialize the SimpliSafe alarm."""
+        from simplisafe import SimpliSafe
+        self.simplisafe = SimpliSafe(username, password)
+        self._name = name
+        self._code = str(code) if code else None
+        self._id = self.simplisafe.get_id()
+        status = self.simplisafe.get_state()
+        if status == 'Off':
+            self._state = STATE_ALARM_DISARMED
+        elif status == 'Home':
+            self._state = STATE_ALARM_ARMED_HOME
+        elif status == 'Away':
+            self._state = STATE_ALARM_ARMED_AWAY
+        else:
+            self._state = STATE_UNKNOWN
+
+    @property
+    def should_poll(self):
+        """Poll the SimpliSafe API."""
+        return True
+
+    @property
+    def name(self):
+        """Return the name of the device."""
+        if self._name is not None:
+            return self._name
+        else:
+            return 'Alarm {}'.format(self._id)
+
+    @property
+    def code_format(self):
+        """One or more characters if code is defined."""
+        return None if self._code is None else '.+'
+
+    @property
+    def state(self):
+        """Return the state of the device."""
+        return self._state
+
+    def update(self):
+        """Update alarm status."""
+        self.simplisafe.get_location()
+        status = self.simplisafe.get_state()
+
+        if status == 'Off':
+            self._state = STATE_ALARM_DISARMED
+        elif status == 'Home':
+            self._state = STATE_ALARM_ARMED_HOME
+        elif status == 'Away':
+            self._state = STATE_ALARM_ARMED_AWAY
+        else:
+            self._state = STATE_UNKNOWN
+
+    def alarm_disarm(self, code=None):
+        """Send disarm command."""
+        if not self._validate_code(code, 'disarming'):
+            return
+        self.simplisafe.set_state('off')
+        _LOGGER.info('SimpliSafe alarm disarming')
+        self.update()
+
+    def alarm_arm_home(self, code=None):
+        """Send arm home command."""
+        if not self._validate_code(code, 'arming home'):
+            return
+        self.simplisafe.set_state('home')
+        _LOGGER.info('SimpliSafe alarm arming home')
+        self.update()
+
+    def alarm_arm_away(self, code=None):
+        """Send arm away command."""
+        if not self._validate_code(code, 'arming away'):
+            return
+        self.simplisafe.set_state('away')
+        _LOGGER.info('SimpliSafe alarm arming away')
+        self.update()
+
+    def _validate_code(self, code, state):
+        """Validate given code."""
+        check = self._code is None or code == self._code
+        if not check:
+            _LOGGER.warning('Wrong code entered for %s', state)
+        return check

homeassistant/components/alarm_control_panel/verisure.py

@@ -37,6 +37,7 @@ class VerisureAlarm(alarm.AlarmControlPanel):
         self._id = device_id
         self._state = STATE_UNKNOWN
         self._digits = int(hub.config.get('code_digits', '4'))
+        self._changed_by = None
 
     @property
     def name(self):
@@ -58,6 +59,11 @@ class VerisureAlarm(alarm.AlarmControlPanel):
         """The code format as regex."""
         return '^\\d{%s}$' % self._digits
 
+    @property
+    def changed_by(self):
+        """Last change triggered by."""
+        return self._changed_by
+
     def update(self):
         """Update alarm status."""
         hub.update_alarms()
@@ -72,6 +78,7 @@ class VerisureAlarm(alarm.AlarmControlPanel):
             _LOGGER.error(
                 'Unknown alarm state %s',
                 hub.alarm_status[self._id].status)
+        self._changed_by = hub.alarm_status[self._id].name
 
     def alarm_disarm(self, code=None):
         """Send disarm command."""

homeassistant/components/api.py

@@ -6,7 +6,7 @@ https://home-assistant.io/developers/api/
 """
 import json
 import logging
-from time import time
+import queue
 
 import homeassistant.core as ha
 import homeassistant.remote as rem
@@ -72,19 +72,14 @@ class APIEventStream(HomeAssistantView):
 
     def get(self, request):
         """Provide a streaming interface for the event bus."""
-        from eventlet.queue import LightQueue, Empty
-        import eventlet
-
-        cur_hub = eventlet.hubs.get_hub()
-        request.environ['eventlet.minimum_write_chunk_size'] = 0
-        to_write = LightQueue()
         stop_obj = object()
+        to_write = queue.Queue()
 
         restrict = request.args.get('restrict')
         if restrict:
-            restrict = restrict.split(',')
+            restrict = restrict.split(',') + [EVENT_HOMEASSISTANT_STOP]
 
-        def thread_forward_events(event):
+        def forward_events(event):
             """Forward events to the open request."""
             if event.event_type == EVENT_TIME_CHANGED:
                 return
@@ -99,28 +94,20 @@ class APIEventStream(HomeAssistantView):
             else:
                 data = json.dumps(event, cls=rem.JSONEncoder)
 
-            cur_hub.schedule_call_global(0, lambda: to_write.put(data))
+            to_write.put(data)
 
         def stream():
             """Stream events to response."""
-            self.hass.bus.listen(MATCH_ALL, thread_forward_events)
+            self.hass.bus.listen(MATCH_ALL, forward_events)
 
             _LOGGER.debug('STREAM %s ATTACHED', id(stop_obj))
 
-            last_msg = time()
             # Fire off one message right away to have browsers fire open event
             to_write.put(STREAM_PING_PAYLOAD)
 
             while True:
                 try:
-                    # Somehow our queue.get sometimes takes too long to
-                    # be notified of arrival of data. Probably
-                    # because of our spawning on hub in other thread
-                    # hack. Because current goal is to get this out,
-                    # We just timeout every second because it will
-                    # return right away if qsize() > 0.
-                    # So yes, we're basically polling :(
-                    payload = to_write.get(timeout=1)
+                    payload = to_write.get(timeout=STREAM_PING_INTERVAL)
 
                     if payload is stop_obj:
                         break
@@ -129,15 +116,13 @@ class APIEventStream(HomeAssistantView):
                     _LOGGER.debug('STREAM %s WRITING %s', id(stop_obj),
                                   msg.strip())
                     yield msg.encode("UTF-8")
-                    last_msg = time()
-                except Empty:
-                    if time() - last_msg > 50:
-                        to_write.put(STREAM_PING_PAYLOAD)
+                except queue.Empty:
+                    to_write.put(STREAM_PING_PAYLOAD)
                 except GeneratorExit:
-                    _LOGGER.debug('STREAM %s RESPONSE CLOSED', id(stop_obj))
                     break
 
-            self.hass.bus.remove_listener(MATCH_ALL, thread_forward_events)
+            _LOGGER.debug('STREAM %s RESPONSE CLOSED', id(stop_obj))
+            self.hass.bus.remove_listener(MATCH_ALL, forward_events)
 
         return self.Response(stream(), mimetype='text/event-stream')
 
@@ -204,11 +189,12 @@ class APIEntityStateView(HomeAssistantView):
             return self.json_message('No state specified', HTTP_BAD_REQUEST)
 
         attributes = request.json.get('attributes')
+        force_update = request.json.get('force_update', False)
 
         is_new_state = self.hass.states.get(entity_id) is None
 
         # Write state
-        self.hass.states.set(entity_id, new_state, attributes)
+        self.hass.states.set(entity_id, new_state, attributes, force_update)
 
         # Read the state back for our response
         resp = self.json(self.hass.states.get(entity_id))

homeassistant/components/binary_sensor/envisalink.py

@@ -0,0 +1,71 @@
+"""
+Support for Envisalink zone states- represented as binary sensors.
+
+For more details about this platform, please refer to the documentation at
+https://home-assistant.io/components/binary_sensor.envisalink/
+"""
+import logging
+from homeassistant.components.binary_sensor import BinarySensorDevice
+from homeassistant.components.envisalink import (EVL_CONTROLLER,
+                                                 ZONE_SCHEMA,
+                                                 CONF_ZONENAME,
+                                                 CONF_ZONETYPE,
+                                                 EnvisalinkDevice,
+                                                 SIGNAL_ZONE_UPDATE)
+from homeassistant.const import ATTR_LAST_TRIP_TIME
+
+DEPENDENCIES = ['envisalink']
+_LOGGER = logging.getLogger(__name__)
+
+
+def setup_platform(hass, config, add_devices_callback, discovery_info=None):
+    """Setup Envisalink binary sensor devices."""
+    _configured_zones = discovery_info['zones']
+    for zone_num in _configured_zones:
+        _device_config_data = ZONE_SCHEMA(_configured_zones[zone_num])
+        _device = EnvisalinkBinarySensor(
+            zone_num,
+            _device_config_data[CONF_ZONENAME],
+            _device_config_data[CONF_ZONETYPE],
+            EVL_CONTROLLER.alarm_state['zone'][zone_num],
+            EVL_CONTROLLER)
+        add_devices_callback([_device])
+
+
+class EnvisalinkBinarySensor(EnvisalinkDevice, BinarySensorDevice):
+    """Representation of an Envisalink binary sensor."""
+
+    # pylint: disable=too-many-arguments
+    def __init__(self, zone_number, zone_name, zone_type, info, controller):
+        """Initialize the binary_sensor."""
+        from pydispatch import dispatcher
+        self._zone_type = zone_type
+        self._zone_number = zone_number
+
+        _LOGGER.debug('Setting up zone: ' + zone_name)
+        EnvisalinkDevice.__init__(self, zone_name, info, controller)
+        dispatcher.connect(self._update_callback,
+                           signal=SIGNAL_ZONE_UPDATE,
+                           sender=dispatcher.Any)
+
+    @property
+    def device_state_attributes(self):
+        """Return the state attributes."""
+        attr = {}
+        attr[ATTR_LAST_TRIP_TIME] = self._info['last_fault']
+        return attr
+
+    @property
+    def is_on(self):
+        """Return true if sensor is on."""
+        return self._info['status']['open']
+
+    @property
+    def sensor_class(self):
+        """Return the class of this sensor, from SENSOR_CLASSES."""
+        return self._zone_type
+
+    def _update_callback(self, zone):
+        """Update the zone's state, if needed."""
+        if zone is None or int(zone) == self._zone_number:
+            self.update_ha_state()

homeassistant/components/binary_sensor/homematic.py

@@ -0,0 +1,100 @@
+"""
+Support for Homematic binary sensors.
+
+For more details about this platform, please refer to the documentation at
+https://home-assistant.io/components/binary_sensor.homematic/
+"""
+import logging
+from homeassistant.const import STATE_UNKNOWN
+from homeassistant.components.binary_sensor import BinarySensorDevice
+import homeassistant.components.homematic as homematic
+
+_LOGGER = logging.getLogger(__name__)
+
+DEPENDENCIES = ['homematic']
+
+SENSOR_TYPES_CLASS = {
+    "Remote": None,
+    "ShutterContact": "opening",
+    "Smoke": "smoke",
+    "SmokeV2": "smoke",
+    "Motion": "motion",
+    "MotionV2": "motion",
+    "RemoteMotion": None
+}
+
+
+def setup_platform(hass, config, add_callback_devices, discovery_info=None):
+    """Setup the Homematic binary sensor platform."""
+    if discovery_info is None:
+        return
+
+    return homematic.setup_hmdevice_discovery_helper(HMBinarySensor,
+                                                     discovery_info,
+                                                     add_callback_devices)
+
+
+class HMBinarySensor(homematic.HMDevice, BinarySensorDevice):
+    """Representation of a binary Homematic device."""
+
+    @property
+    def is_on(self):
+        """Return true if switch is on."""
+        if not self.available:
+            return False
+        return bool(self._hm_get_state())
+
+    @property
+    def sensor_class(self):
+        """Return the class of this sensor, from SENSOR_CLASSES."""
+        if not self.available:
+            return None
+
+        # If state is MOTION (RemoteMotion works only)
+        if self._state == "MOTION":
+            return "motion"
+        return SENSOR_TYPES_CLASS.get(self._hmdevice.__class__.__name__, None)
+
+    def _check_hm_to_ha_object(self):
+        """Check if possible to use the HM Object as this HA type."""
+        from pyhomematic.devicetypes.sensors import HMBinarySensor\
+            as pyHMBinarySensor
+
+        # Check compatibility from HMDevice
+        if not super()._check_hm_to_ha_object():
+            return False
+
+        # check if the Homematic device correct for this HA device
+        if not isinstance(self._hmdevice, pyHMBinarySensor):
+            _LOGGER.critical("This %s can't be use as binary", self._name)
+            return False
+
+        # if exists user value?
+        if self._state and self._state not in self._hmdevice.BINARYNODE:
+            _LOGGER.critical("This %s have no binary with %s", self._name,
+                             self._state)
+            return False
+
+        # only check and give a warning to the user
+        if self._state is None and len(self._hmdevice.BINARYNODE) > 1:
+            _LOGGER.critical("%s have multiple binary params. It use all "
+                             "binary nodes as one. Possible param values: %s",
+                             self._name, str(self._hmdevice.BINARYNODE))
+            return False
+
+        return True
+
+    def _init_data_struct(self):
+        """Generate a data struct (self._data) from the Homematic metadata."""
+        super()._init_data_struct()
+
+        # object have 1 binary
+        if self._state is None and len(self._hmdevice.BINARYNODE) == 1:
+            for value in self._hmdevice.BINARYNODE:
+                self._state = value
+
+        # add state to data struct
+        if self._state:
+            _LOGGER.debug("%s init datastruct with main node '%s'", self._name,
+                          self._state)
+            self._data.update({self._state: STATE_UNKNOWN})

homeassistant/components/binary_sensor/knx.py

@@ -0,0 +1,24 @@
+"""
+Contains functionality to use a KNX group address as a binary.
+
+For more details about this platform, please refer to the documentation at
+https://home-assistant.io/components/binary_sensor.knx/
+"""
+from homeassistant.components.binary_sensor import BinarySensorDevice
+from homeassistant.components.knx import (
+    KNXConfig, KNXGroupAddress)
+
+DEPENDENCIES = ["knx"]
+
+
+def setup_platform(hass, config, add_entities, discovery_info=None):
+    """Setup the KNX binary sensor platform."""
+    add_entities([
+        KNXSwitch(hass, KNXConfig(config))
+    ])
+
+
+class KNXSwitch(KNXGroupAddress, BinarySensorDevice):
+    """Representation of a KNX binary sensor device."""
+
+    pass

homeassistant/components/binary_sensor/nx584.py

@@ -18,7 +18,7 @@ _LOGGER = logging.getLogger(__name__)
 
 
 def setup_platform(hass, config, add_devices, discovery_info=None):
-    """Setup nx584 sensors."""
+    """Setup nx584 binary sensor platform."""
     from nx584 import client as nx584_client
 
     host = config.get('host', 'localhost:5007')

homeassistant/components/binary_sensor/vera.py

@@ -6,9 +6,6 @@ https://home-assistant.io/components/binary_sensor.vera/
 """
 import logging
 
-import homeassistant.util.dt as dt_util
-from homeassistant.const import (
-    ATTR_ARMED, ATTR_BATTERY_LEVEL, ATTR_LAST_TRIP_TIME, ATTR_TRIPPED)
 from homeassistant.components.binary_sensor import (
     BinarySensorDevice)
 from homeassistant.components.vera import (
@@ -34,30 +31,6 @@ class VeraBinarySensor(VeraDevice, BinarySensorDevice):
         self._state = False
         VeraDevice.__init__(self, vera_device, controller)
 
-    @property
-    def device_state_attributes(self):
-        """Return the state attributes."""
-        attr = {}
-        if self.vera_device.has_battery:
-            attr[ATTR_BATTERY_LEVEL] = self.vera_device.battery_level + '%'
-
-        if self.vera_device.is_armable:
-            armed = self.vera_device.is_armed
-            attr[ATTR_ARMED] = 'True' if armed else 'False'
-
-        if self.vera_device.is_trippable:
-            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] = utc_time.isoformat()
-            else:
-                attr[ATTR_LAST_TRIP_TIME] = None
-            tripped = self.vera_device.is_tripped
-            attr[ATTR_TRIPPED] = 'True' if tripped else 'False'
-
-        attr['Vera Device Id'] = self.vera_device.vera_device_id
-        return attr
-
     @property
     def is_on(self):
         """Return true if sensor is on."""

homeassistant/components/binary_sensor/wink.py

@@ -5,24 +5,28 @@ For more details about this platform, please refer to the documentation at
 at https://home-assistant.io/components/sensor.wink/
 """
 import logging
+import json
 
 from homeassistant.components.binary_sensor import BinarySensorDevice
-from homeassistant.const import CONF_ACCESS_TOKEN, ATTR_BATTERY_LEVEL
+from homeassistant.components.sensor.wink import WinkDevice
+from homeassistant.const import CONF_ACCESS_TOKEN
 from homeassistant.helpers.entity import Entity
+from homeassistant.loader import get_component
 
-REQUIREMENTS = ['python-wink==0.7.7']
+REQUIREMENTS = ['python-wink==0.7.11', 'pubnub==3.8.2']
 
 # These are the available sensors mapped to binary_sensor class
 SENSOR_TYPES = {
     "opened": "opening",
     "brightness": "light",
     "vibration": "vibration",
-    "loudness": "sound"
+    "loudness": "sound",
+    "liquid_detected": "moisture"
 }
 
 
 def setup_platform(hass, config, add_devices, discovery_info=None):
-    """Setup the Wink platform."""
+    """Setup the Wink binary sensor platform."""
     import pywink
 
     if discovery_info is None:
@@ -40,17 +44,28 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
         if sensor.capability() in SENSOR_TYPES:
             add_devices([WinkBinarySensorDevice(sensor)])
 
+    for key in pywink.get_keys():
+        add_devices([WinkBinarySensorDevice(key)])
 
-class WinkBinarySensorDevice(BinarySensorDevice, Entity):
-    """Representation of a Wink sensor."""
+
+class WinkBinarySensorDevice(WinkDevice, BinarySensorDevice, Entity):
+    """Representation of a Wink binary sensor."""
 
     def __init__(self, wink):
         """Initialize the Wink binary sensor."""
-        self.wink = wink
+        super().__init__(wink)
+        wink = get_component('wink')
         self._unit_of_measurement = self.wink.UNIT
-        self._battery = self.wink.battery_level
         self.capability = self.wink.capability()
 
+    def _pubnub_update(self, message, channel):
+        if 'data' in message:
+            json_data = json.dumps(message.get('data'))
+        else:
+            json_data = message
+        self.wink.pubnub_update(json.loads(json_data))
+        self.update_ha_state()
+
     @property
     def is_on(self):
         """Return true if the binary sensor is on."""
@@ -60,6 +75,8 @@ class WinkBinarySensorDevice(BinarySensorDevice, Entity):
             return self.wink.vibration_boolean()
         elif self.capability == "brightness":
             return self.wink.brightness_boolean()
+        elif self.capability == "liquid_detected":
+            return self.wink.liquid_boolean()
         else:
             return self.wink.state()
 
@@ -67,35 +84,3 @@ class WinkBinarySensorDevice(BinarySensorDevice, Entity):
     def sensor_class(self):
         """Return the class of this sensor, from SENSOR_CLASSES."""
         return SENSOR_TYPES.get(self.capability)
-
-    @property
-    def unique_id(self):
-        """Return the ID of this wink sensor."""
-        return "{}.{}".format(self.__class__, self.wink.device_id())
-
-    @property
-    def name(self):
-        """Return the name of the sensor if any."""
-        return self.wink.name()
-
-    @property
-    def available(self):
-        """True if connection == True."""
-        return self.wink.available
-
-    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

homeassistant/components/binary_sensor/zigbee.py

@@ -12,7 +12,7 @@ DEPENDENCIES = ["zigbee"]
 
 
 def setup_platform(hass, config, add_entities, discovery_info=None):
-    """Create and add an entity based on the configuration."""
+    """Setup the ZigBee binary sensor platform."""
     add_entities([
         ZigBeeBinarySensor(hass, ZigBeeDigitalInConfig(config))
     ])

homeassistant/components/binary_sensor/zwave.py

@@ -8,6 +8,7 @@ import logging
 import datetime
 import homeassistant.util.dt as dt_util
 from homeassistant.helpers.event import track_point_in_time
+from homeassistant.helpers.entity import Entity
 from homeassistant.components import zwave
 from homeassistant.components.binary_sensor import (
     DOMAIN,
@@ -31,7 +32,7 @@ DEVICE_MAPPINGS = {
 
 
 def setup_platform(hass, config, add_devices, discovery_info=None):
-    """Setup the Z-Wave platform for sensors."""
+    """Setup the Z-Wave platform for binary sensors."""
     if discovery_info is None or zwave.NETWORK is None:
         return
 
@@ -61,7 +62,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
         add_devices([ZWaveBinarySensor(value, None)])
 
 
-class ZWaveBinarySensor(BinarySensorDevice, zwave.ZWaveDeviceEntity):
+class ZWaveBinarySensor(BinarySensorDevice, zwave.ZWaveDeviceEntity, Entity):
     """Representation of a binary sensor within Z-Wave."""
 
     def __init__(self, value, sensor_class):
@@ -93,11 +94,12 @@ class ZWaveBinarySensor(BinarySensorDevice, zwave.ZWaveDeviceEntity):
 
     def value_changed(self, value):
         """Called when a value has changed on the network."""
-        if self._value.value_id == value.value_id:
+        if self._value.value_id == value.value_id or \
+           self._value.node == value.node:
             self.update_ha_state()
 
 
-class ZWaveTriggerSensor(ZWaveBinarySensor):
+class ZWaveTriggerSensor(ZWaveBinarySensor, Entity):
     """Representation of a stateless sensor within Z-Wave."""
 
     def __init__(self, sensor_value, sensor_class, hass, re_arm_sec=60):

homeassistant/components/browser.py

@@ -13,7 +13,8 @@ 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,
+    # pylint: disable=no-value-for-parameter
+    vol.Required(ATTR_URL, default=ATTR_URL_DEFAULT): vol.Url(),
 })
 
 

homeassistant/components/camera/__init__.py

@@ -6,6 +6,7 @@ For more details about this component, please refer to the documentation at
 https://home-assistant.io/components/camera/
 """
 import logging
+import time
 
 from homeassistant.helpers.entity import Entity
 from homeassistant.helpers.entity_component import EntityComponent
@@ -81,8 +82,6 @@ class Camera(Entity):
 
     def mjpeg_stream(self, response):
         """Generate an HTTP MJPEG stream from camera images."""
-        import eventlet
-
         def stream():
             """Stream images as mjpeg stream."""
             try:
@@ -99,7 +98,7 @@ class Camera(Entity):
 
                         last_image = img_bytes
 
-                    eventlet.sleep(0.5)
+                    time.sleep(0.5)
             except GeneratorExit:
                 pass
 

homeassistant/components/camera/demo.py

@@ -18,7 +18,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
 
 
 class DemoCamera(Camera):
-    """A Demo camera."""
+    """The representation of a Demo camera."""
 
     def __init__(self, name):
         """Initialize demo camera component."""

homeassistant/components/camera/ffmpeg.py

@@ -0,0 +1,75 @@
+"""
+Support for Cameras with FFmpeg as decoder.
+
+For more details about this platform, please refer to the documentation at
+https://home-assistant.io/components/camera.ffmpeg/
+"""
+import logging
+from contextlib import closing
+
+import voluptuous as vol
+
+from homeassistant.components.camera import Camera
+from homeassistant.components.camera.mjpeg import extract_image_from_mjpeg
+import homeassistant.helpers.config_validation as cv
+from homeassistant.const import CONF_NAME, CONF_PLATFORM
+
+REQUIREMENTS = ["ha-ffmpeg==0.4"]
+
+CONF_INPUT = 'input'
+CONF_FFMPEG_BIN = 'ffmpeg_bin'
+CONF_EXTRA_ARGUMENTS = 'extra_arguments'
+
+PLATFORM_SCHEMA = vol.Schema({
+    vol.Required(CONF_PLATFORM): "ffmpeg",
+    vol.Optional(CONF_NAME, default="FFmpeg"): cv.string,
+    vol.Required(CONF_INPUT): cv.string,
+    vol.Optional(CONF_FFMPEG_BIN, default="ffmpeg"): cv.string,
+    vol.Optional(CONF_EXTRA_ARGUMENTS): cv.string,
+})
+
+_LOGGER = logging.getLogger(__name__)
+
+
+def setup_platform(hass, config, add_devices_callback, discovery_info=None):
+    """Setup a FFmpeg Camera."""
+    add_devices_callback([FFmpegCamera(config)])
+
+
+class FFmpegCamera(Camera):
+    """An implementation of an FFmpeg camera."""
+
+    def __init__(self, config):
+        """Initialize a FFmpeg camera."""
+        super().__init__()
+        self._name = config.get(CONF_NAME)
+        self._input = config.get(CONF_INPUT)
+        self._extra_arguments = config.get(CONF_EXTRA_ARGUMENTS)
+        self._ffmpeg_bin = config.get(CONF_FFMPEG_BIN)
+
+    def _ffmpeg_stream(self):
+        """Return a FFmpeg process object."""
+        from haffmpeg import CameraMjpeg
+
+        ffmpeg = CameraMjpeg(self._ffmpeg_bin)
+        ffmpeg.open_camera(self._input, extra_cmd=self._extra_arguments)
+        return ffmpeg
+
+    def camera_image(self):
+        """Return a still image response from the camera."""
+        with closing(self._ffmpeg_stream()) as stream:
+            return extract_image_from_mjpeg(stream)
+
+    def mjpeg_stream(self, response):
+        """Generate an HTTP MJPEG stream from the camera."""
+        stream = self._ffmpeg_stream()
+        return response(
+            stream,
+            mimetype='multipart/x-mixed-replace;boundary=ffserver',
+            direct_passthrough=True
+        )
+
+    @property
+    def name(self):
+        """Return the name of this camera."""
+        return self._name

homeassistant/components/camera/mjpeg.py

@@ -28,6 +28,18 @@ def setup_platform(hass, config, add_devices_callback, discovery_info=None):
     add_devices_callback([MjpegCamera(config)])
 
 
+def extract_image_from_mjpeg(stream):
+    """Take in a MJPEG stream object, return the jpg from it."""
+    data = b''
+    for chunk in stream:
+        data += chunk
+        jpg_start = data.find(b'\xff\xd8')
+        jpg_end = data.find(b'\xff\xd9')
+        if jpg_start != -1 and jpg_end != -1:
+            jpg = data[jpg_start:jpg_end + 2]
+            return jpg
+
+
 # pylint: disable=too-many-instance-attributes
 class MjpegCamera(Camera):
     """An implementation of an IP camera that is reachable over a URL."""
@@ -52,19 +64,8 @@ class MjpegCamera(Camera):
 
     def camera_image(self):
         """Return a still image response from the camera."""
-        def process_response(response):
-            """Take in a response object, return the jpg from it."""
-            data = b''
-            for chunk in response.iter_content(1024):
-                data += chunk
-                jpg_start = data.find(b'\xff\xd8')
-                jpg_end = data.find(b'\xff\xd9')
-                if jpg_start != -1 and jpg_end != -1:
-                    jpg = data[jpg_start:jpg_end + 2]
-                    return jpg
-
         with closing(self.camera_stream()) as response:
-            return process_response(response)
+            return extract_image_from_mjpeg(response.iter_content(1024))
 
     def mjpeg_stream(self, response):
         """Generate an HTTP MJPEG stream from the camera."""

homeassistant/components/camera/netatmo.py

@@ -89,7 +89,7 @@ class WelcomeData(object):
         """Return all module available on the API as a list."""
         self.update()
         if not self.home:
-            for home in self.welcomedata.cameras.keys():
+            for home in self.welcomedata.cameras:
                 for camera in self.welcomedata.cameras[home].values():
                     self.camera_names.append(camera['name'])
         else:

homeassistant/components/camera/rpi_camera.py

@@ -1,5 +1,9 @@
-"""Camera platform that has a Raspberry Pi camera."""
+"""
+Camera platform that has a Raspberry Pi camera.
 
+For more details about this platform, please refer to the documentation at
+https://home-assistant.io/components/camera.rpi_camera/
+"""
 import os
 import subprocess
 import logging
@@ -43,7 +47,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
 
 
 class RaspberryCamera(Camera):
-    """Raspberry Pi camera."""
+    """Representation of a Raspberry Pi camera."""
 
     def __init__(self, device_info):
         """Initialize Raspberry Pi camera component."""

homeassistant/components/conversation.py

@@ -27,7 +27,7 @@ SERVICE_PROCESS_SCHEMA = vol.Schema({
 
 REGEX_TURN_COMMAND = re.compile(r'turn (?P<name>(?: |\w)+) (?P<command>\w+)')
 
-REQUIREMENTS = ['fuzzywuzzy==0.10.0']
+REQUIREMENTS = ['fuzzywuzzy==0.11.1']
 
 
 def setup(hass, config):
@@ -67,8 +67,8 @@ def setup(hass, config):
             }, blocking=True)
 
         else:
-            logger.error(
-                'Got unsupported command %s from text %s', command, text)
+            logger.error('Got unsupported command %s from text %s',
+                         command, text)
 
     hass.services.register(DOMAIN, SERVICE_PROCESS, process,
                            schema=SERVICE_PROCESS_SCHEMA)

homeassistant/components/demo.py

@@ -37,6 +37,7 @@ def setup(hass, config):
     """Setup a demo environment."""
     group = loader.get_component('group')
     configurator = loader.get_component('configurator')
+    persistent_notification = loader.get_component('persistent_notification')
 
     config.setdefault(ha.DOMAIN, {})
     config.setdefault(DOMAIN, {})
@@ -59,6 +60,11 @@ def setup(hass, config):
         demo_config[component] = {CONF_PLATFORM: 'demo'}
         bootstrap.setup_component(hass, component, demo_config)
 
+    # Setup example persistent notification
+    persistent_notification.create(
+        hass, 'This is an example of a persistent notification.',
+        title='Example Notification')
+
     # Setup room groups
     lights = sorted(hass.states.entity_ids('light'))
     switches = sorted(hass.states.entity_ids('switch'))

homeassistant/components/device_tracker/__init__.py

@@ -377,12 +377,16 @@ def load_config(path, hass, consider_home, home_range):
     """Load devices from YAML configuration file."""
     if not os.path.isfile(path):
         return []
-    return [
-        Device(hass, consider_home, home_range, device.get('track', False),
-               str(dev_id).lower(), str(device.get('mac')).upper(),
-               device.get('name'), device.get('picture'),
-               device.get(CONF_AWAY_HIDE, DEFAULT_AWAY_HIDE))
-        for dev_id, device in load_yaml_config_file(path).items()]
+    try:
+        return [
+            Device(hass, consider_home, home_range, device.get('track', False),
+                   str(dev_id).lower(), str(device.get('mac')).upper(),
+                   device.get('name'), device.get('picture'),
+                   device.get(CONF_AWAY_HIDE, DEFAULT_AWAY_HIDE))
+            for dev_id, device in load_yaml_config_file(path).items()]
+    except HomeAssistantError:
+        # When YAML file could not be loaded/did not contain a dict
+        return []
 
 
 def setup_scanner_platform(hass, config, scanner, see_device):

homeassistant/components/device_tracker/asuswrt.py

@@ -62,8 +62,9 @@ def get_scanner(hass, config):
                            _LOGGER):
         return None
     elif CONF_PASSWORD not in config[DOMAIN] and \
+            'ssh_key' not in config[DOMAIN] and \
             'pub_key' not in config[DOMAIN]:
-        _LOGGER.error("Either a public key or password must be provided")
+        _LOGGER.error('Either a private key or password must be provided')
         return None
 
     scanner = AsusWrtDeviceScanner(config[DOMAIN])
@@ -83,8 +84,8 @@ class AsusWrtDeviceScanner(object):
         """Initialize the scanner."""
         self.host = config[CONF_HOST]
         self.username = str(config[CONF_USERNAME])
-        self.password = str(config.get(CONF_PASSWORD))
-        self.pub_key = str(config.get('pub_key'))
+        self.password = str(config.get(CONF_PASSWORD, ''))
+        self.ssh_key = str(config.get('ssh_key', config.get('pub_key', '')))
         self.protocol = config.get('protocol')
         self.mode = config.get('mode')
 
@@ -120,7 +121,7 @@ class AsusWrtDeviceScanner(object):
             return False
 
         with self.lock:
-            _LOGGER.info("Checking ARP")
+            _LOGGER.info('Checking ARP')
             data = self.get_asuswrt_data()
             if not data:
                 return False
@@ -138,12 +139,12 @@ class AsusWrtDeviceScanner(object):
 
         try:
             ssh = pxssh.pxssh()
-            if self.pub_key:
-                ssh.login(self.host, self.username, ssh_key=self.pub_key)
+            if self.ssh_key:
+                ssh.login(self.host, self.username, ssh_key=self.ssh_key)
             elif self.password:
                 ssh.login(self.host, self.username, self.password)
             else:
-                _LOGGER.error('No password or public key specified')
+                _LOGGER.error('No password or private key specified')
                 return None
             ssh.sendline(_IP_NEIGH_CMD)
             ssh.prompt()
@@ -195,16 +196,16 @@ class AsusWrtDeviceScanner(object):
             telnet.write('exit\n'.encode('ascii'))
             return AsusWrtResult(neighbors, leases_result, arp_result)
         except EOFError:
-            _LOGGER.error("Unexpected response from router")
+            _LOGGER.error('Unexpected response from router')
             return None
         except ConnectionRefusedError:
-            _LOGGER.error("Connection refused by router, is telnet enabled?")
+            _LOGGER.error('Connection refused by router, is telnet enabled?')
             return None
         except socket.gaierror as exc:
-            _LOGGER.error("Socket exception: %s", exc)
+            _LOGGER.error('Socket exception: %s', exc)
             return None
         except OSError as exc:
-            _LOGGER.error("OSError: %s", exc)
+            _LOGGER.error('OSError: %s', exc)
             return None
 
     def get_asuswrt_data(self):
@@ -232,7 +233,7 @@ class AsusWrtDeviceScanner(object):
                 match = _WL_REGEX.search(lease.decode('utf-8'))
 
                 if not match:
-                    _LOGGER.warning("Could not parse wl row: %s", lease)
+                    _LOGGER.warning('Could not parse wl row: %s', lease)
                     continue
 
                 host = ''
@@ -242,7 +243,7 @@ class AsusWrtDeviceScanner(object):
                     if match.group('mac').lower() in arp.decode('utf-8'):
                         arp_match = _ARP_REGEX.search(arp.decode('utf-8'))
                         if not arp_match:
-                            _LOGGER.warning("Could not parse arp row: %s", arp)
+                            _LOGGER.warning('Could not parse arp row: %s', arp)
                             continue
 
                         devices[arp_match.group('ip')] = {
@@ -256,7 +257,7 @@ class AsusWrtDeviceScanner(object):
                 match = _LEASES_REGEX.search(lease.decode('utf-8'))
 
                 if not match:
-                    _LOGGER.warning("Could not parse lease row: %s", lease)
+                    _LOGGER.warning('Could not parse lease row: %s', lease)
                     continue
 
                 # For leases where the client doesn't set a hostname, ensure it
@@ -275,7 +276,7 @@ class AsusWrtDeviceScanner(object):
         for neighbor in result.neighbors:
             match = _IP_NEIGH_REGEX.search(neighbor.decode('utf-8'))
             if not match:
-                _LOGGER.warning("Could not parse neighbor row: %s", neighbor)
+                _LOGGER.warning('Could not parse neighbor row: %s', neighbor)
                 continue
             if match.group('ip') in devices:
                 devices[match.group('ip')]['status'] = match.group('status')

homeassistant/components/device_tracker/icloud.py

@@ -5,17 +5,28 @@ For more details about this platform, please refer to the documentation at
 https://home-assistant.io/components/device_tracker.icloud/
 """
 import logging
-import re
+import voluptuous as vol
 
-from homeassistant.const import CONF_PASSWORD, CONF_USERNAME
+from homeassistant.const import (CONF_PASSWORD, CONF_USERNAME,
+                                 EVENT_HOMEASSISTANT_START)
 from homeassistant.helpers.event import track_utc_time_change
+from homeassistant.util import slugify
+from homeassistant.components.device_tracker import (ENTITY_ID_FORMAT,
+                                                     PLATFORM_SCHEMA)
 
 _LOGGER = logging.getLogger(__name__)
 
-REQUIREMENTS = ['pyicloud==0.8.3']
+REQUIREMENTS = ['pyicloud==0.9.1']
 
 CONF_INTERVAL = 'interval'
-DEFAULT_INTERVAL = 8
+KEEPALIVE_INTERVAL = 4
+
+PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
+    vol.Required(CONF_USERNAME): vol.Coerce(str),
+    vol.Required(CONF_PASSWORD): vol.Coerce(str),
+    vol.Optional(CONF_INTERVAL, default=8): vol.All(vol.Coerce(int),
+                                                    vol.Range(min=1))
+    })
 
 
 def setup_scanner(hass, config, see):
@@ -23,63 +34,67 @@ def setup_scanner(hass, config, see):
     from pyicloud import PyiCloudService
     from pyicloud.exceptions import PyiCloudFailedLoginException
     from pyicloud.exceptions import PyiCloudNoDevicesException
+    logging.getLogger("pyicloud.base").setLevel(logging.WARNING)
 
-    # Get the username and password from the configuration.
-    username = config.get(CONF_USERNAME)
-    password = config.get(CONF_PASSWORD)
-
-    if username is None or password is None:
-        _LOGGER.error('Must specify a username and password')
-        return False
+    username = config[CONF_USERNAME]
+    password = config[CONF_PASSWORD]
 
     try:
         _LOGGER.info('Logging into iCloud Account')
         # Attempt the login to iCloud
-        api = PyiCloudService(username,
-                              password,
-                              verify=True)
+        api = PyiCloudService(username, password, verify=True)
     except PyiCloudFailedLoginException as error:
         _LOGGER.exception('Error logging into iCloud Service: %s', error)
         return False
 
     def keep_alive(now):
-        """Keep authenticating iCloud connection."""
+        """Keep authenticating iCloud connection.
+
+        The session timeouts if we are not using it so we
+        have to re-authenticate & this will send an email.
+        """
         api.authenticate()
         _LOGGER.info("Authenticate against iCloud")
 
-    track_utc_time_change(hass, keep_alive, second=0)
+    seen_devices = {}
 
     def update_icloud(now):
         """Authenticate against iCloud and scan for devices."""
         try:
-            # The session timeouts if we are not using it so we
-            # have to re-authenticate. This will send an email.
-            api.authenticate()
+            keep_alive(None)
             # Loop through every device registered with the iCloud account
             for device in api.devices:
                 status = device.status()
+                dev_id = slugify(status['name'].replace(' ', '', 99))
+
+                # An entity will not be created by see() when track=false in
+                # 'known_devices.yaml', but we need to see() it at least once
+                entity = hass.states.get(ENTITY_ID_FORMAT.format(dev_id))
+                if entity is None and dev_id in seen_devices:
+                    continue
+                seen_devices[dev_id] = True
+
                 location = device.location()
                 # If the device has a location add it. If not do nothing
                 if location:
                     see(
-                        dev_id=re.sub(r"(\s|\W|')",
-                                      '',
-                                      status['name']),
+                        dev_id=dev_id,
                         host_name=status['name'],
                         gps=(location['latitude'], location['longitude']),
                         battery=status['batteryLevel']*100,
                         gps_accuracy=location['horizontalAccuracy']
                     )
-                else:
-                    # No location found for the device so continue
-                    continue
         except PyiCloudNoDevicesException:
             _LOGGER.info('No iCloud Devices found!')
 
-    track_utc_time_change(
-        hass, update_icloud,
-        minute=range(0, 60, config.get(CONF_INTERVAL, DEFAULT_INTERVAL)),
-        second=0
-    )
+    hass.bus.listen_once(EVENT_HOMEASSISTANT_START, update_icloud)
+
+    update_minutes = list(range(0, 60, config[CONF_INTERVAL]))
+    # Schedule keepalives between the updates
+    keepalive_minutes = list(x for x in range(0, 60, KEEPALIVE_INTERVAL)
+                             if x not in update_minutes)
+
+    track_utc_time_change(hass, update_icloud, second=0, minute=update_minutes)
+    track_utc_time_change(hass, keep_alive, second=0, minute=keepalive_minutes)
 
     return True

homeassistant/components/device_tracker/nmap_tracker.py

@@ -21,10 +21,10 @@ MIN_TIME_BETWEEN_SCANS = timedelta(seconds=5)
 
 _LOGGER = logging.getLogger(__name__)
 
-# interval in minutes to exclude devices from a scan while they are home
+# Interval in minutes to exclude devices from a scan while they are home
 CONF_HOME_INTERVAL = "home_interval"
 
-REQUIREMENTS = ['python-nmap==0.6.0']
+REQUIREMENTS = ['python-nmap==0.6.1']
 
 
 def get_scanner(hass, config):

homeassistant/components/device_tracker/unifi.py

@@ -16,6 +16,7 @@ REQUIREMENTS = ['urllib3', 'unifi==1.2.5']
 
 _LOGGER = logging.getLogger(__name__)
 CONF_PORT = 'port'
+CONF_SITE_ID = 'site_id'
 
 
 def get_scanner(hass, config):
@@ -32,6 +33,7 @@ def get_scanner(hass, config):
     host = this_config.get(CONF_HOST, 'localhost')
     username = this_config.get(CONF_USERNAME)
     password = this_config.get(CONF_PASSWORD)
+    site_id = this_config.get(CONF_SITE_ID, 'default')
 
     try:
         port = int(this_config.get(CONF_PORT, 8443))
@@ -40,7 +42,7 @@ def get_scanner(hass, config):
         return False
 
     try:
-        ctrl = Controller(host, username, password, port, 'v4')
+        ctrl = Controller(host, username, password, port, 'v4', site_id)
     except urllib.error.HTTPError as ex:
         _LOGGER.error('Failed to connect to unifi: %s', ex)
         return False

homeassistant/components/discovery.py

@@ -13,7 +13,7 @@ from homeassistant.const import EVENT_HOMEASSISTANT_START
 from homeassistant.helpers.discovery import load_platform, discover
 
 DOMAIN = "discovery"
-REQUIREMENTS = ['netdisco==0.6.7']
+REQUIREMENTS = ['netdisco==0.7.1']
 
 SCAN_INTERVAL = 300  # seconds
 
@@ -30,6 +30,7 @@ SERVICE_HANDLERS = {
     'roku': ('media_player', 'roku'),
     'sonos': ('media_player', 'sonos'),
     'logitech_mediaserver': ('media_player', 'squeezebox'),
+    'directv': ('media_player', 'directv'),
 }
 
 

homeassistant/components/downloader.py

@@ -24,7 +24,8 @@ ATTR_URL = "url"
 ATTR_SUBDIR = "subdir"
 
 SERVICE_DOWNLOAD_FILE_SCHEMA = vol.Schema({
-    vol.Required(ATTR_URL): vol.Url,
+    # pylint: disable=no-value-for-parameter
+    vol.Required(ATTR_URL): vol.Url(),
     vol.Optional(ATTR_SUBDIR): cv.string,
 })
 

homeassistant/components/envisalink.py

@@ -0,0 +1,210 @@
+"""
+Support for Envisalink devices.
+
+For more details about this component, please refer to the documentation at
+https://home-assistant.io/components/envisalink/
+"""
+import logging
+import time
+import voluptuous as vol
+import homeassistant.helpers.config_validation as cv
+from homeassistant.const import EVENT_HOMEASSISTANT_STOP
+from homeassistant.helpers.entity import Entity
+from homeassistant.components.discovery import load_platform
+
+REQUIREMENTS = ['pyenvisalink==1.0', 'pydispatcher==2.0.5']
+
+_LOGGER = logging.getLogger(__name__)
+DOMAIN = 'envisalink'
+
+EVL_CONTROLLER = None
+
+CONF_EVL_HOST = 'host'
+CONF_EVL_PORT = 'port'
+CONF_PANEL_TYPE = 'panel_type'
+CONF_EVL_VERSION = 'evl_version'
+CONF_CODE = 'code'
+CONF_USERNAME = 'user_name'
+CONF_PASS = 'password'
+CONF_EVL_KEEPALIVE = 'keepalive_interval'
+CONF_ZONEDUMP_INTERVAL = 'zonedump_interval'
+CONF_ZONES = 'zones'
+CONF_PARTITIONS = 'partitions'
+
+CONF_ZONENAME = 'name'
+CONF_ZONETYPE = 'type'
+CONF_PARTITIONNAME = 'name'
+
+DEFAULT_PORT = 4025
+DEFAULT_EVL_VERSION = 3
+DEFAULT_KEEPALIVE = 60
+DEFAULT_ZONEDUMP_INTERVAL = 30
+DEFAULT_ZONETYPE = 'opening'
+
+SIGNAL_ZONE_UPDATE = 'zones_updated'
+SIGNAL_PARTITION_UPDATE = 'partition_updated'
+SIGNAL_KEYPAD_UPDATE = 'keypad_updated'
+
+ZONE_SCHEMA = vol.Schema({
+    vol.Required(CONF_ZONENAME): cv.string,
+    vol.Optional(CONF_ZONETYPE, default=DEFAULT_ZONETYPE): cv.string})
+
+PARTITION_SCHEMA = vol.Schema({
+    vol.Required(CONF_PARTITIONNAME): cv.string})
+
+CONFIG_SCHEMA = vol.Schema({
+    DOMAIN: vol.Schema({
+        vol.Required(CONF_EVL_HOST): cv.string,
+        vol.Required(CONF_PANEL_TYPE):
+            vol.All(cv.string, vol.In(['HONEYWELL', 'DSC'])),
+        vol.Required(CONF_USERNAME): cv.string,
+        vol.Required(CONF_PASS): cv.string,
+        vol.Required(CONF_CODE): cv.string,
+        vol.Optional(CONF_ZONES): {vol.Coerce(int): ZONE_SCHEMA},
+        vol.Optional(CONF_PARTITIONS): {vol.Coerce(int): PARTITION_SCHEMA},
+        vol.Optional(CONF_EVL_PORT, default=DEFAULT_PORT):
+            vol.All(vol.Coerce(int), vol.Range(min=1, max=65535)),
+        vol.Optional(CONF_EVL_VERSION, default=DEFAULT_EVL_VERSION):
+            vol.All(vol.Coerce(int), vol.Range(min=3, max=4)),
+        vol.Optional(CONF_EVL_KEEPALIVE, default=DEFAULT_KEEPALIVE):
+            vol.All(vol.Coerce(int), vol.Range(min=15)),
+        vol.Optional(CONF_ZONEDUMP_INTERVAL,
+                     default=DEFAULT_ZONEDUMP_INTERVAL):
+            vol.All(vol.Coerce(int), vol.Range(min=15)),
+    }),
+}, extra=vol.ALLOW_EXTRA)
+
+
+# pylint: disable=unused-argument, too-many-function-args, too-many-locals
+# pylint: disable=too-many-return-statements
+def setup(hass, base_config):
+    """Common setup for Envisalink devices."""
+    from pyenvisalink import EnvisalinkAlarmPanel
+    from pydispatch import dispatcher
+
+    global EVL_CONTROLLER
+
+    config = base_config.get(DOMAIN)
+
+    _host = config.get(CONF_EVL_HOST)
+    _port = config.get(CONF_EVL_PORT)
+    _code = config.get(CONF_CODE)
+    _panel_type = config.get(CONF_PANEL_TYPE)
+    _version = config.get(CONF_EVL_VERSION)
+    _user = config.get(CONF_USERNAME)
+    _pass = config.get(CONF_PASS)
+    _keep_alive = config.get(CONF_EVL_KEEPALIVE)
+    _zone_dump = config.get(CONF_ZONEDUMP_INTERVAL)
+    _zones = config.get(CONF_ZONES)
+    _partitions = config.get(CONF_PARTITIONS)
+    _connect_status = {}
+    EVL_CONTROLLER = EnvisalinkAlarmPanel(_host,
+                                          _port,
+                                          _panel_type,
+                                          _version,
+                                          _user,
+                                          _pass,
+                                          _zone_dump,
+                                          _keep_alive)
+
+    def login_fail_callback(data):
+        """Callback for when the evl rejects our login."""
+        _LOGGER.error("The envisalink rejected your credentials.")
+        _connect_status['fail'] = 1
+
+    def connection_fail_callback(data):
+        """Network failure callback."""
+        _LOGGER.error("Could not establish a connection with the envisalink.")
+        _connect_status['fail'] = 1
+
+    def connection_success_callback(data):
+        """Callback for a successful connection."""
+        _LOGGER.info("Established a connection with the envisalink.")
+        _connect_status['success'] = 1
+
+    def zones_updated_callback(data):
+        """Handle zone timer updates."""
+        _LOGGER.info("Envisalink sent a zone update event.  Updating zones...")
+        dispatcher.send(signal=SIGNAL_ZONE_UPDATE,
+                        sender=None,
+                        zone=data)
+
+    def alarm_data_updated_callback(data):
+        """Handle non-alarm based info updates."""
+        _LOGGER.info("Envisalink sent new alarm info. Updating alarms...")
+        dispatcher.send(signal=SIGNAL_KEYPAD_UPDATE,
+                        sender=None,
+                        partition=data)
+
+    def partition_updated_callback(data):
+        """Handle partition changes thrown by evl (including alarms)."""
+        _LOGGER.info("The envisalink sent a partition update event.")
+        dispatcher.send(signal=SIGNAL_PARTITION_UPDATE,
+                        sender=None,
+                        partition=data)
+
+    def stop_envisalink(event):
+        """Shutdown envisalink connection and thread on exit."""
+        _LOGGER.info("Shutting down envisalink.")
+        EVL_CONTROLLER.stop()
+
+    def start_envisalink(event):
+        """Startup process for the Envisalink."""
+        EVL_CONTROLLER.start()
+        for _ in range(10):
+            if 'success' in _connect_status:
+                hass.bus.listen_once(EVENT_HOMEASSISTANT_STOP, stop_envisalink)
+                return True
+            elif 'fail' in _connect_status:
+                return False
+            else:
+                time.sleep(1)
+
+        _LOGGER.error("Timeout occurred while establishing evl connection.")
+        return False
+
+    EVL_CONTROLLER.callback_zone_timer_dump = zones_updated_callback
+    EVL_CONTROLLER.callback_zone_state_change = zones_updated_callback
+    EVL_CONTROLLER.callback_partition_state_change = partition_updated_callback
+    EVL_CONTROLLER.callback_keypad_update = alarm_data_updated_callback
+    EVL_CONTROLLER.callback_login_failure = login_fail_callback
+    EVL_CONTROLLER.callback_login_timeout = connection_fail_callback
+    EVL_CONTROLLER.callback_login_success = connection_success_callback
+
+    _result = start_envisalink(None)
+    if not _result:
+        return False
+
+    # Load sub-components for Envisalink
+    if _partitions:
+        load_platform(hass, 'alarm_control_panel', 'envisalink',
+                      {'partitions': _partitions,
+                       'code': _code}, config)
+        load_platform(hass, 'sensor', 'envisalink',
+                      {'partitions': _partitions,
+                       'code': _code}, config)
+    if _zones:
+        load_platform(hass, 'binary_sensor', 'envisalink',
+                      {'zones': _zones}, config)
+
+    return True
+
+
+class EnvisalinkDevice(Entity):
+    """Representation of an Envisalink device."""
+
+    def __init__(self, name, info, controller):
+        """Initialize the device."""
+        self._controller = controller
+        self._info = info
+        self._name = name
+
+    @property
+    def name(self):
+        """Return the name of the device."""
+        return self._name
+
+    @property
+    def should_poll(self):
+        """No polling needed."""
+        return False

homeassistant/components/foursquare.py

@@ -0,0 +1,99 @@
+"""
+Allows utilizing the Foursquare (Swarm) API.
+
+For more details about this component, please refer to the documentation at
+https://home-assistant.io/components/foursquare/
+"""
+import logging
+import os
+import json
+import requests
+
+import voluptuous as vol
+
+from homeassistant.config import load_yaml_config_file
+import homeassistant.helpers.config_validation as cv
+from homeassistant.components.http import HomeAssistantView
+
+DOMAIN = "foursquare"
+
+SERVICE_CHECKIN = "checkin"
+
+EVENT_PUSH = "foursquare.push"
+EVENT_CHECKIN = "foursquare.checkin"
+
+CHECKIN_SERVICE_SCHEMA = vol.Schema({
+    vol.Required("venueId"): cv.string,
+    vol.Optional("eventId"): cv.string,
+    vol.Optional("shout"): cv.string,
+    vol.Optional("mentions"): cv.string,
+    vol.Optional("broadcast"): cv.string,
+    vol.Optional("ll"): cv.string,
+    vol.Optional("llAcc"): cv.string,
+    vol.Optional("alt"): cv.string,
+    vol.Optional("altAcc"): cv.string,
+})
+
+_LOGGER = logging.getLogger(__name__)
+
+DEPENDENCIES = ["http"]
+
+
+def setup(hass, config):
+    """Setup the Foursquare component."""
+    descriptions = load_yaml_config_file(
+        os.path.join(os.path.dirname(__file__), "services.yaml"))
+
+    config = config[DOMAIN]
+
+    def checkin_user(call):
+        """Check a user in on Swarm."""
+        url = ("https://api.foursquare.com/v2/checkins/add"
+               "?oauth_token={}"
+               "&v=20160802"
+               "&m=swarm").format(config["access_token"])
+        response = requests.post(url, data=call.data, timeout=10)
+
+        if response.status_code not in (200, 201):
+            _LOGGER.exception(
+                "Error checking in user. Response %d: %s:",
+                response.status_code, response.reason)
+
+        hass.bus.fire(EVENT_CHECKIN, response.text)
+
+    # Register our service with Home Assistant.
+    hass.services.register(DOMAIN, "checkin", checkin_user,
+                           descriptions[DOMAIN][SERVICE_CHECKIN],
+                           schema=CHECKIN_SERVICE_SCHEMA)
+
+    hass.wsgi.register_view(FoursquarePushReceiver(hass,
+                                                   config["push_secret"]))
+
+    return True
+
+
+class FoursquarePushReceiver(HomeAssistantView):
+    """Handle pushes from the Foursquare API."""
+
+    requires_auth = False
+    url = "/api/foursquare"
+    name = "foursquare"
+
+    def __init__(self, hass, push_secret):
+        """Initialize the OAuth callback view."""
+        super().__init__(hass)
+        self.push_secret = push_secret
+
+    def post(self, request):
+        """Accept the POST from Foursquare."""
+        raw_data = request.form
+        _LOGGER.debug("Received Foursquare push: %s", raw_data)
+        if self.push_secret != raw_data["secret"]:
+            _LOGGER.error("Received Foursquare push with invalid"
+                          "push secret! Data: %s", raw_data)
+            return
+        parsed_payload = {
+            key: json.loads(val) for key, val in raw_data.items()
+            if key != "secret"
+        }
+        self.hass.bus.fire(EVENT_PUSH, parsed_payload)

homeassistant/components/frontend/__init__.py

@@ -1,37 +1,131 @@
 """Handle the frontend for Home Assistant."""
+import hashlib
+import logging
 import os
 
-from . import version, mdi_version
+from homeassistant.const import EVENT_HOMEASSISTANT_START
 from homeassistant.components import api
 from homeassistant.components.http import HomeAssistantView
+from .version import FINGERPRINTS
 
 DOMAIN = 'frontend'
 DEPENDENCIES = ['api']
+URL_PANEL_COMPONENT = '/frontend/panels/{}.html'
+URL_PANEL_COMPONENT_FP = '/frontend/panels/{}-{}.html'
+STATIC_PATH = os.path.join(os.path.dirname(__file__), 'www_static')
+PANELS = {}
+
+# To keep track we don't register a component twice (gives a warning)
+_REGISTERED_COMPONENTS = set()
+_LOGGER = logging.getLogger(__name__)
+
+
+def register_built_in_panel(hass, component_name, sidebar_title=None,
+                            sidebar_icon=None, url_path=None, config=None):
+    """Register a built-in panel."""
+    # pylint: disable=too-many-arguments
+    path = 'panels/ha-panel-{}.html'.format(component_name)
+
+    if hass.wsgi.development:
+        url = ('/static/home-assistant-polymer/panels/'
+               '{0}/ha-panel-{0}.html'.format(component_name))
+    else:
+        url = None  # use default url generate mechanism
+
+    register_panel(hass, component_name, os.path.join(STATIC_PATH, path),
+                   FINGERPRINTS[path], sidebar_title, sidebar_icon, url_path,
+                   url, config)
+
+
+def register_panel(hass, component_name, path, md5=None, sidebar_title=None,
+                   sidebar_icon=None, url_path=None, url=None, config=None):
+    """Register a panel for the frontend.
+
+    component_name: name of the web component
+    path: path to the HTML of the web component
+    md5: the md5 hash of the web component (for versioning, optional)
+    sidebar_title: title to show in the sidebar (optional)
+    sidebar_icon: icon to show next to title in sidebar (optional)
+    url_path: name to use in the url (defaults to component_name)
+    url: for the web component (for dev environment, optional)
+    config: config to be passed into the web component
+
+    Warning: this API will probably change. Use at own risk.
+    """
+    # pylint: disable=too-many-arguments
+    if url_path is None:
+        url_path = component_name
+
+    if url_path in PANELS:
+        _LOGGER.warning('Overwriting component %s', url_path)
+    if not os.path.isfile(path):
+        _LOGGER.error('Panel %s component does not exist: %s',
+                      component_name, path)
+        return
+
+    if md5 is None:
+        with open(path) as fil:
+            md5 = hashlib.md5(fil.read().encode('utf-8')).hexdigest()
+
+    data = {
+        'url_path': url_path,
+        'component_name': component_name,
+    }
+
+    if sidebar_title:
+        data['title'] = sidebar_title
+    if sidebar_icon:
+        data['icon'] = sidebar_icon
+    if config is not None:
+        data['config'] = config
+
+    if url is not None:
+        data['url'] = url
+    else:
+        url = URL_PANEL_COMPONENT.format(component_name)
+
+        if url not in _REGISTERED_COMPONENTS:
+            hass.wsgi.register_static_path(url, path)
+            _REGISTERED_COMPONENTS.add(url)
+
+        fprinted_url = URL_PANEL_COMPONENT_FP.format(component_name, md5)
+        data['url'] = fprinted_url
+
+    PANELS[url_path] = data
 
 
 def setup(hass, config):
     """Setup serving the frontend."""
-    hass.wsgi.register_view(IndexView)
     hass.wsgi.register_view(BootstrapView)
 
-    www_static_path = os.path.join(os.path.dirname(__file__), 'www_static')
     if hass.wsgi.development:
         sw_path = "home-assistant-polymer/build/service_worker.js"
     else:
         sw_path = "service_worker.js"
 
-    hass.wsgi.register_static_path(
-        "/service_worker.js",
-        os.path.join(www_static_path, sw_path),
-        0
-    )
-    hass.wsgi.register_static_path(
-        "/robots.txt",
-        os.path.join(www_static_path, "robots.txt")
-    )
-    hass.wsgi.register_static_path("/static", www_static_path)
+    hass.wsgi.register_static_path("/service_worker.js",
+                                   os.path.join(STATIC_PATH, sw_path), 0)
+    hass.wsgi.register_static_path("/robots.txt",
+                                   os.path.join(STATIC_PATH, "robots.txt"))
+    hass.wsgi.register_static_path("/static", STATIC_PATH)
     hass.wsgi.register_static_path("/local", hass.config.path('www'))
 
+    register_built_in_panel(hass, 'map', 'Map', 'mdi:account-location')
+
+    for panel in ('dev-event', 'dev-info', 'dev-service', 'dev-state',
+                  'dev-template'):
+        register_built_in_panel(hass, panel)
+
+    def register_frontend_index(event):
+        """Register the frontend index urls.
+
+        Done when Home Assistant is started so that all panels are known.
+        """
+        hass.wsgi.register_view(IndexView(
+            hass, ['/{}'.format(name) for name in PANELS]))
+
+    hass.bus.listen_once(EVENT_HOMEASSISTANT_START, register_frontend_index)
+
     return True
 
 
@@ -48,6 +142,7 @@ class BootstrapView(HomeAssistantView):
             'states': self.hass.states.all(),
             'events': api.events_json(self.hass),
             'services': api.services_json(self.hass),
+            'panels': PANELS,
         })
 
 
@@ -57,16 +152,15 @@ class IndexView(HomeAssistantView):
     url = '/'
     name = "frontend:index"
     requires_auth = False
-    extra_urls = ['/logbook', '/history', '/map', '/devService', '/devState',
-                  '/devEvent', '/devInfo', '/devTemplate',
-                  '/states', '/states/<entity:entity_id>']
+    extra_urls = ['/states', '/states/<entity:entity_id>']
 
-    def __init__(self, hass):
+    def __init__(self, hass, extra_urls):
         """Initialize the frontend view."""
         super().__init__(hass)
 
         from jinja2 import FileSystemLoader, Environment
 
+        self.extra_urls = self.extra_urls + extra_urls
         self.templates = Environment(
             loader=FileSystemLoader(
                 os.path.join(os.path.dirname(__file__), 'templates/')
@@ -76,26 +170,32 @@ class IndexView(HomeAssistantView):
     def get(self, request, entity_id=None):
         """Serve the index view."""
         if self.hass.wsgi.development:
-            core_url = 'home-assistant-polymer/build/_core_compiled.js'
-            ui_url = 'home-assistant-polymer/src/home-assistant.html'
+            core_url = '/static/home-assistant-polymer/build/core.js'
+            ui_url = '/static/home-assistant-polymer/src/home-assistant.html'
         else:
-            core_url = 'core-{}.js'.format(version.CORE)
-            ui_url = 'frontend-{}.html'.format(version.UI)
+            core_url = '/static/core-{}.js'.format(
+                FINGERPRINTS['core.js'])
+            ui_url = '/static/frontend-{}.html'.format(
+                FINGERPRINTS['frontend.html'])
+
+        if request.path == '/':
+            panel = 'states'
+        else:
+            panel = request.path.split('/')[1]
+
+        panel_url = PANELS[panel]['url'] if panel != 'states' else ''
 
         # auto login if no password was set
-        if self.hass.config.api.api_password is None:
-            auth = 'true'
-        else:
-            auth = 'false'
-
-        icons_url = 'mdi-{}.html'.format(mdi_version.VERSION)
+        no_auth = 'false' if self.hass.config.api.api_password else 'true'
 
+        icons_url = '/static/mdi-{}.html'.format(FINGERPRINTS['mdi.html'])
         template = self.templates.get_template('index.html')
 
         # pylint is wrong
         # pylint: disable=no-member
         resp = template.render(
-            core_url=core_url, ui_url=ui_url, auth=auth,
-            icons_url=icons_url, icons=mdi_version.VERSION)
+            core_url=core_url, ui_url=ui_url, no_auth=no_auth,
+            icons_url=icons_url, icons=FINGERPRINTS['mdi.html'],
+            panel_url=panel_url, panels=PANELS)
 
         return self.Response(resp, mimetype='text/html')

homeassistant/components/frontend/mdi_version.py

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

homeassistant/components/frontend/templates/index.html

@@ -5,19 +5,29 @@
     <title>Home Assistant</title>
 
     <link rel='manifest' href='/static/manifest.json'>
-    <link rel='icon' href='/static/favicon.ico'>
+    <link rel='icon' href='/static/icons/favicon.ico'>
     <link rel='apple-touch-icon' sizes='180x180'
-          href='/static/favicon-apple-180x180.png'>
+          href='/static/icons/favicon-apple-180x180.png'>
+    {% for panel in panels.values() -%}
+      <link rel='prefetch' href='{{ panel.url }}'>
+    {% endfor -%}
     <meta name='apple-mobile-web-app-capable' content='yes'>
-    <meta name="msapplication-square70x70logo" content="/static/tile-win-70x70.png"/>
-    <meta name="msapplication-square150x150logo" content="/static/tile-win-150x150.png"/>
-    <meta name="msapplication-wide310x150logo" content="/static/tile-win-310x150.png"/>
-    <meta name="msapplication-square310x310logo" content="/static/tile-win-310x310.png"/>
+    <meta name="msapplication-square70x70logo" content="/static/icons/tile-win-70x70.png"/>
+    <meta name="msapplication-square150x150logo" content="/static/icons/tile-win-150x150.png"/>
+    <meta name="msapplication-wide310x150logo" content="/static/icons/tile-win-310x150.png"/>
+    <meta name="msapplication-square310x310logo" content="/static/icons/tile-win-310x310.png"/>
     <meta name="msapplication-TileColor" content="#3fbbf4ff"/>
     <meta name='mobile-web-app-capable' content='yes'>
     <meta name='viewport' content='width=device-width, user-scalable=no'>
     <meta name='theme-color' content='#03a9f4'>
     <style>
+      body {
+        font-family: 'Roboto', 'Noto', sans-serif;
+        font-weight: 300;
+        -webkit-font-smoothing: antialiased;
+        text-rendering: optimizeLegibility;
+      }
+
       #ha-init-skeleton {
         display: -webkit-flex;
         display: flex;
@@ -64,32 +74,36 @@
         document
           .getElementById('ha-init-skeleton')
           .classList.add('error');
-      }
-      window.noAuth = {{ auth }}
+      };
+      window.noAuth = {{ no_auth }};
+      window.Polymer = {lazyRegister: true, useNativeCSSProperties: true, dom: 'shady'};
     </script>
   </head>
-  <body fullbleed>
+  <body>
     <div id='ha-init-skeleton'>
-      <img src='/static/favicon-192x192.png' height='192'>
+      <img src='/static/icons/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>
     <home-assistant icons='{{ icons }}'></home-assistant>
     {# <script src='/static/home-assistant-polymer/build/_demo_data_compiled.js'></script> #}
-    <script src='/static/{{ core_url }}'></script>
-    <link rel='import' href='/static/{{ ui_url }}' onerror='initError()' async>
-    <link rel='import' href='/static/{{ icons_url }}' async>
+    <script src='{{ core_url }}'></script>
+    <link rel='import' href='{{ ui_url }}' onerror='initError()'>
+    {% if panel_url -%}
+      <link rel='import' href='{{ panel_url }}' onerror='initError()' async>
+    {% endif -%}
+    <link rel='import' href='{{ icons_url }}' async>
     <script>
       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)
+        var e = document.createElement('script');
+        e.async = true;
+        e.onerror = initError;
+        e.src = '/static/webcomponents-lite.min.js';
+        document.head.appendChild(e);
       }
     </script>
   </body>

homeassistant/components/frontend/version.py

@@ -1,3 +1,16 @@
-"""DO NOT MODIFY. Auto-generated by build_frontend script."""
-CORE = "7962327e4a29e51d4a6f4ee6cca9acc3"
-UI = "570e1b8744a58024fc4e256f5e024424"
+"""DO NOT MODIFY. Auto-generated by script/fingerprint_frontend."""
+
+FINGERPRINTS = {
+    "core.js": "457d5acd123e7dc38947c07984b3a5e8",
+    "frontend.html": "829ee7cb591b8a63d7f22948a7aeb07a",
+    "mdi.html": "b399b5d3798f5b68b0a4fbaae3432d48",
+    "panels/ha-panel-dev-event.html": "3cc881ae8026c0fba5aa67d334a3ab2b",
+    "panels/ha-panel-dev-info.html": "34e2df1af32e60fffcafe7e008a92169",
+    "panels/ha-panel-dev-service.html": "bb5c587ada694e0fd42ceaaedd6fe6aa",
+    "panels/ha-panel-dev-state.html": "4608326978256644c42b13940c028e0a",
+    "panels/ha-panel-dev-template.html": "0a099d4589636ed3038a3e9f020468a7",
+    "panels/ha-panel-history.html": "efe1bcdd7733b09e55f4f965d171c295",
+    "panels/ha-panel-iframe.html": "d920f0aa3c903680f2f8795e2255daab",
+    "panels/ha-panel-logbook.html": "66108d82763359a218c9695f0553de40",
+    "panels/ha-panel-map.html": "af7d04aff7dd5479c5a0016bc8d4dd7d"
+}

homeassistant/components/frontend/www_static/manifest.json

@@ -7,22 +7,22 @@
   "background_color": "#FFFFFF",
   "icons": [
     {
-     "src": "/static/favicon-192x192.png",
+     "src": "/static/icons/favicon-192x192.png",
      "sizes": "192x192",
      "type": "image/png"
     },
     {
-     "src": "/static/favicon-384x384.png",
+     "src": "/static/icons/favicon-384x384.png",
      "sizes": "384x384",
      "type": "image/png"
     },
     {
-     "src": "/static/favicon-512x512.png",
+     "src": "/static/icons/favicon-512x512.png",
      "sizes": "512x512",
      "type": "image/png"
     },
     {
-     "src": "/static/favicon-1024x1024.png",
+     "src": "/static/icons/favicon-1024x1024.png",
      "sizes": "1024x1024",
      "type": "image/png"
     }

homeassistant/components/frontend/www_static/panels/ha-panel-dev-info.html

@@ -0,0 +1,2 @@
+<html><head><meta charset="UTF-8"></head><body><dom-module id="ha-panel-dev-info"><template><style include="iron-positioning ha-style">:host{background-color:#fff;-ms-user-select:initial;-webkit-user-select:initial;-moz-user-select:initial}.content{padding:24px}.about{text-align:center;line-height:2em}.version{@apply(--paper-font-headline)}.develop{@apply(--paper-font-subhead)}.about a{color:var(--dark-primary-color)}.error-log-intro{margin-top:16px;border-top:1px solid var(--light-primary-color);padding-top:16px}paper-icon-button{float:right}.error-log{@apply(--paper-font-code1)
+        clear: both;white-space:pre-wrap}</style><app-header-layout has-scrolling-region=""><app-header fixed=""><app-toolbar><ha-menu-button narrow="[[narrow]]" show-menu="[[showMenu]]"></ha-menu-button><div main-title="">About</div></app-toolbar></app-header><div class="content fit"><div class="about"><p class="version"><a href="https://home-assistant.io"><img src="/static/icons/favicon-192x192.png" height="192"></a><br>Home Assistant<br>[[hassVersion]]</p><p class="develop"><a href="https://home-assistant.io/developers/credits/" target="_blank">Developed by a bunch of awesome people.</a></p><p>Published under the MIT license<br>Source: <a href="https://github.com/balloob/home-assistant" target="_blank">server</a> — <a href="https://github.com/balloob/home-assistant-polymer" target="_blank">frontend-ui</a> — <a href="https://github.com/balloob/home-assistant-js" target="_blank">frontend-core</a></p><p>Built using <a href="https://www.python.org">Python 3</a>, <a href="https://www.polymer-project.org" target="_blank">Polymer [[polymerVersion]]</a>, <a href="https://optimizely.github.io/nuclear-js/" target="_blank">NuclearJS [[nuclearVersion]]</a><br>Icons by <a href="https://www.google.com/design/icons/" target="_blank">Google</a> and <a href="https://MaterialDesignIcons.com" target="_blank">MaterialDesignIcons.com</a>.</p></div><p class="error-log-intro">The following errors have been logged this session:<paper-icon-button icon="mdi:refresh" on-tap="refreshErrorLog"></paper-icon-button></p><div class="error-log">[[errorLog]]</div></div></app-header-layout></template></dom-module><script>Polymer({is:"ha-panel-dev-info",behaviors:[window.hassBehavior],properties:{hass:{type:Object},narrow:{type:Boolean,value:!1},showMenu:{type:Boolean,value:!1},hassVersion:{type:String,bindNuclear:function(r){return r.configGetters.serverVersion}},polymerVersion:{type:String,value:Polymer.version},nuclearVersion:{type:String,value:"1.3.0"},errorLog:{type:String,value:""}},attached:function(){this.refreshErrorLog()},refreshErrorLog:function(r){r&&r.preventDefault(),this.errorLog="Loading error log…",this.hass.errorLogActions.fetchErrorLog().then(function(r){this.errorLog=r||"No errors have been reported."}.bind(this))}})</script></body></html>

homeassistant/components/frontend/www_static/panels/ha-panel-iframe.html

@@ -0,0 +1 @@
+<html><head><meta charset="UTF-8"></head><body><dom-module id="ha-panel-iframe"><template><style include="ha-style">iframe{border:0;width:100%;height:calc(100% - 64px)}</style><app-toolbar><ha-menu-button narrow="[[narrow]]" show-menu="[[showMenu]]"></ha-menu-button><div main-title="">[[panel.title]]</div></app-toolbar><iframe src="[[panel.config.url]]" sandbox="allow-forms allow-popups allow-pointer-lock allow-same-origin allow-scripts"></iframe></template></dom-module><script>Polymer({is:"ha-panel-iframe",properties:{panel:{type:Object},narrow:{type:Boolean},showMenu:{type:Boolean}}})</script></body></html>

homeassistant/components/frontend/www_static/service_worker.js

@@ -1,258 +1 @@
-/**
- * Copyright 2016 Google Inc. All rights reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-// This generated service worker JavaScript will precache your site's resources.
-// The code needs to be saved in a .js file at the top-level of your site, and registered
-// from your pages in order to be used. See
-// https://github.com/googlechrome/sw-precache/blob/master/demo/app/js/service-worker-registration.js
-// for an example of how you can register this script and handle various service worker events.
-
-/* eslint-env worker, serviceworker */
-/* eslint-disable indent, no-unused-vars, no-multiple-empty-lines, max-nested-callbacks, space-before-function-paren */
-'use strict';
-
-
-
-
-
-/* eslint-disable quotes, comma-spacing */
-var PrecacheConfig = [["/","595e12c9755af231fd80191e4cc74d2e"],["/devEvent","595e12c9755af231fd80191e4cc74d2e"],["/devInfo","595e12c9755af231fd80191e4cc74d2e"],["/devService","595e12c9755af231fd80191e4cc74d2e"],["/devState","595e12c9755af231fd80191e4cc74d2e"],["/devTemplate","595e12c9755af231fd80191e4cc74d2e"],["/history","595e12c9755af231fd80191e4cc74d2e"],["/logbook","595e12c9755af231fd80191e4cc74d2e"],["/map","595e12c9755af231fd80191e4cc74d2e"],["/states","595e12c9755af231fd80191e4cc74d2e"],["/static/core-7962327e4a29e51d4a6f4ee6cca9acc3.js","9c07ffb3f81cfb74f8a051b80cc8f9f0"],["/static/frontend-570e1b8744a58024fc4e256f5e024424.html","595e12c9755af231fd80191e4cc74d2e"],["/static/mdi-9ee3d4466a65bef35c2c8974e91b37c0.html","9a6846935116cd29279c91e0ee0a26d0"],["static/favicon-192x192.png","419903b8422586a7e28021bbe9011175"],["static/fonts/roboto/Roboto-Bold.ttf","d329cc8b34667f114a95422aaad1b063"],["static/fonts/roboto/Roboto-Light.ttf","7b5fb88f12bec8143f00e21bc3222124"],["static/fonts/roboto/Roboto-Medium.ttf","fe13e4170719c2fc586501e777bde143"],["static/fonts/roboto/Roboto-Regular.ttf","ac3f799d5bbaf5196fab15ab8de8431c"],["static/images/card_media_player_bg.png","a34281d1c1835d338a642e90930e61aa"],["static/webcomponents-lite.min.js","b0f32ad3c7749c40d486603f31c9d8b1"]];
-/* eslint-enable quotes, comma-spacing */
-var CacheNamePrefix = 'sw-precache-v1--' + (self.registration ? self.registration.scope : '') + '-';
-
-
-var IgnoreUrlParametersMatching = [/^utm_/];
-
-
-
-var addDirectoryIndex = function (originalUrl, index) {
-    var url = new URL(originalUrl);
-    if (url.pathname.slice(-1) === '/') {
-      url.pathname += index;
-    }
-    return url.toString();
-  };
-
-var getCacheBustedUrl = function (url, param) {
-    param = param || Date.now();
-
-    var urlWithCacheBusting = new URL(url);
-    urlWithCacheBusting.search += (urlWithCacheBusting.search ? '&' : '') +
-      'sw-precache=' + param;
-
-    return urlWithCacheBusting.toString();
-  };
-
-var isPathWhitelisted = function (whitelist, absoluteUrlString) {
-    // If the whitelist is empty, then consider all URLs to be whitelisted.
-    if (whitelist.length === 0) {
-      return true;
-    }
-
-    // Otherwise compare each path regex to the path of the URL passed in.
-    var path = (new URL(absoluteUrlString)).pathname;
-    return whitelist.some(function(whitelistedPathRegex) {
-      return path.match(whitelistedPathRegex);
-    });
-  };
-
-var populateCurrentCacheNames = function (precacheConfig,
-    cacheNamePrefix, baseUrl) {
-    var absoluteUrlToCacheName = {};
-    var currentCacheNamesToAbsoluteUrl = {};
-
-    precacheConfig.forEach(function(cacheOption) {
-      var absoluteUrl = new URL(cacheOption[0], baseUrl).toString();
-      var cacheName = cacheNamePrefix + absoluteUrl + '-' + cacheOption[1];
-      currentCacheNamesToAbsoluteUrl[cacheName] = absoluteUrl;
-      absoluteUrlToCacheName[absoluteUrl] = cacheName;
-    });
-
-    return {
-      absoluteUrlToCacheName: absoluteUrlToCacheName,
-      currentCacheNamesToAbsoluteUrl: currentCacheNamesToAbsoluteUrl
-    };
-  };
-
-var stripIgnoredUrlParameters = function (originalUrl,
-    ignoreUrlParametersMatching) {
-    var url = new URL(originalUrl);
-
-    url.search = url.search.slice(1) // Exclude initial '?'
-      .split('&') // Split into an array of 'key=value' strings
-      .map(function(kv) {
-        return kv.split('='); // Split each 'key=value' string into a [key, value] array
-      })
-      .filter(function(kv) {
-        return ignoreUrlParametersMatching.every(function(ignoredRegex) {
-          return !ignoredRegex.test(kv[0]); // Return true iff the key doesn't match any of the regexes.
-        });
-      })
-      .map(function(kv) {
-        return kv.join('='); // Join each [key, value] array into a 'key=value' string
-      })
-      .join('&'); // Join the array of 'key=value' strings into a string with '&' in between each
-
-    return url.toString();
-  };
-
-
-var mappings = populateCurrentCacheNames(PrecacheConfig, CacheNamePrefix, self.location);
-var AbsoluteUrlToCacheName = mappings.absoluteUrlToCacheName;
-var CurrentCacheNamesToAbsoluteUrl = mappings.currentCacheNamesToAbsoluteUrl;
-
-function deleteAllCaches() {
-  return caches.keys().then(function(cacheNames) {
-    return Promise.all(
-      cacheNames.map(function(cacheName) {
-        return caches.delete(cacheName);
-      })
-    );
-  });
-}
-
-self.addEventListener('install', function(event) {
-  event.waitUntil(
-    // Take a look at each of the cache names we expect for this version.
-    Promise.all(Object.keys(CurrentCacheNamesToAbsoluteUrl).map(function(cacheName) {
-      return caches.open(cacheName).then(function(cache) {
-        // Get a list of all the entries in the specific named cache.
-        // For caches that are already populated for a given version of a
-        // resource, there should be 1 entry.
-        return cache.keys().then(function(keys) {
-          // If there are 0 entries, either because this is a brand new version
-          // of a resource or because the install step was interrupted the
-          // last time it ran, then we need to populate the cache.
-          if (keys.length === 0) {
-            // Use the last bit of the cache name, which contains the hash,
-            // as the cache-busting parameter.
-            // See https://github.com/GoogleChrome/sw-precache/issues/100
-            var cacheBustParam = cacheName.split('-').pop();
-            var urlWithCacheBusting = getCacheBustedUrl(
-              CurrentCacheNamesToAbsoluteUrl[cacheName], cacheBustParam);
-
-            var request = new Request(urlWithCacheBusting,
-              {credentials: 'same-origin'});
-            return fetch(request).then(function(response) {
-              if (response.ok) {
-                return cache.put(CurrentCacheNamesToAbsoluteUrl[cacheName],
-                  response);
-              }
-
-              console.error('Request for %s returned a response status %d, ' +
-                'so not attempting to cache it.',
-                urlWithCacheBusting, response.status);
-              // Get rid of the empty cache if we can't add a successful response to it.
-              return caches.delete(cacheName);
-            });
-          }
-        });
-      });
-    })).then(function() {
-      return caches.keys().then(function(allCacheNames) {
-        return Promise.all(allCacheNames.filter(function(cacheName) {
-          return cacheName.indexOf(CacheNamePrefix) === 0 &&
-            !(cacheName in CurrentCacheNamesToAbsoluteUrl);
-          }).map(function(cacheName) {
-            return caches.delete(cacheName);
-          })
-        );
-      });
-    }).then(function() {
-      if (typeof self.skipWaiting === 'function') {
-        // Force the SW to transition from installing -> active state
-        self.skipWaiting();
-      }
-    })
-  );
-});
-
-if (self.clients && (typeof self.clients.claim === 'function')) {
-  self.addEventListener('activate', function(event) {
-    event.waitUntil(self.clients.claim());
-  });
-}
-
-self.addEventListener('message', function(event) {
-  if (event.data.command === 'delete_all') {
-    console.log('About to delete all caches...');
-    deleteAllCaches().then(function() {
-      console.log('Caches deleted.');
-      event.ports[0].postMessage({
-        error: null
-      });
-    }).catch(function(error) {
-      console.log('Caches not deleted:', error);
-      event.ports[0].postMessage({
-        error: error
-      });
-    });
-  }
-});
-
-
-self.addEventListener('fetch', function(event) {
-  if (event.request.method === 'GET') {
-    var urlWithoutIgnoredParameters = stripIgnoredUrlParameters(event.request.url,
-      IgnoreUrlParametersMatching);
-
-    var cacheName = AbsoluteUrlToCacheName[urlWithoutIgnoredParameters];
-    var directoryIndex = 'index.html';
-    if (!cacheName && directoryIndex) {
-      urlWithoutIgnoredParameters = addDirectoryIndex(urlWithoutIgnoredParameters, directoryIndex);
-      cacheName = AbsoluteUrlToCacheName[urlWithoutIgnoredParameters];
-    }
-
-    var navigateFallback = '';
-    // Ideally, this would check for event.request.mode === 'navigate', but that is not widely
-    // supported yet:
-    // https://code.google.com/p/chromium/issues/detail?id=540967
-    // https://bugzilla.mozilla.org/show_bug.cgi?id=1209081
-    if (!cacheName && navigateFallback && event.request.headers.has('accept') &&
-        event.request.headers.get('accept').includes('text/html') &&
-        /* eslint-disable quotes, comma-spacing */
-        isPathWhitelisted([], event.request.url)) {
-        /* eslint-enable quotes, comma-spacing */
-      var navigateFallbackUrl = new URL(navigateFallback, self.location);
-      cacheName = AbsoluteUrlToCacheName[navigateFallbackUrl.toString()];
-    }
-
-    if (cacheName) {
-      event.respondWith(
-        // Rely on the fact that each cache we manage should only have one entry, and return that.
-        caches.open(cacheName).then(function(cache) {
-          return cache.keys().then(function(keys) {
-            return cache.match(keys[0]).then(function(response) {
-              if (response) {
-                return response;
-              }
-              // If for some reason the response was deleted from the cache,
-              // raise and exception and fall back to the fetch() triggered in the catch().
-              throw Error('The cache ' + cacheName + ' is empty.');
-            });
-          });
-        }).catch(function(e) {
-          console.warn('Couldn\'t serve response for "%s" from cache: %O', event.request.url, e);
-          return fetch(event.request);
-        })
-      );
-    }
-  }
-});
-
-
-
-
+"use strict";function setOfCachedUrls(e){return e.keys().then(function(e){return e.map(function(e){return e.url})}).then(function(e){return new Set(e)})}var precacheConfig=[["/","a463cb982f337e09c3ed47c41b2d9dda"],["/frontend/panels/dev-event-3cc881ae8026c0fba5aa67d334a3ab2b.html","e22ed0d2d10777c87eb9620d81f525b4"],["/frontend/panels/dev-info-34e2df1af32e60fffcafe7e008a92169.html","7e939dc762dc0c0ec769db4ea76a4b09"],["/frontend/panels/dev-service-bb5c587ada694e0fd42ceaaedd6fe6aa.html","782c4860c5e8ab274231ba9dfd528f29"],["/frontend/panels/dev-state-4608326978256644c42b13940c028e0a.html","26758b741ac1b7c8e9cfcb24762d8774"],["/frontend/panels/dev-template-0a099d4589636ed3038a3e9f020468a7.html","99114026cf9193263c74cc25f9f6a469"],["/frontend/panels/map-af7d04aff7dd5479c5a0016bc8d4dd7d.html","6031df1b4d23d5b321208449b2d293f8"],["/static/core-457d5acd123e7dc38947c07984b3a5e8.js","69e2a5b421d7ed7a7e70390cd9ced80e"],["/static/frontend-829ee7cb591b8a63d7f22948a7aeb07a.html","2afa980f1c1fdf9e596580112ac8e51a"],["/static/mdi-b399b5d3798f5b68b0a4fbaae3432d48.html","819d479ae2b690589687469045b22c26"],["static/fonts/roboto/Roboto-Bold.ttf","d329cc8b34667f114a95422aaad1b063"],["static/fonts/roboto/Roboto-Light.ttf","7b5fb88f12bec8143f00e21bc3222124"],["static/fonts/roboto/Roboto-Medium.ttf","fe13e4170719c2fc586501e777bde143"],["static/fonts/roboto/Roboto-Regular.ttf","ac3f799d5bbaf5196fab15ab8de8431c"],["static/icons/favicon-192x192.png","419903b8422586a7e28021bbe9011175"],["static/icons/favicon.ico","04235bda7843ec2fceb1cbe2bc696cf4"],["static/images/card_media_player_bg.png","a34281d1c1835d338a642e90930e61aa"],["static/webcomponents-lite.min.js","b0f32ad3c7749c40d486603f31c9d8b1"]],cacheName="sw-precache-v2--"+(self.registration?self.registration.scope:""),ignoreUrlParametersMatching=[/^utm_/],addDirectoryIndex=function(e,t){var a=new URL(e);return"/"===a.pathname.slice(-1)&&(a.pathname+=t),a.toString()},createCacheKey=function(e,t,a,n){var c=new URL(e);return n&&c.toString().match(n)||(c.search+=(c.search?"&":"")+encodeURIComponent(t)+"="+encodeURIComponent(a)),c.toString()},isPathWhitelisted=function(e,t){if(0===e.length)return!0;var a=new URL(t).pathname;return e.some(function(e){return a.match(e)})},stripIgnoredUrlParameters=function(e,t){var a=new URL(e);return a.search=a.search.slice(1).split("&").map(function(e){return e.split("=")}).filter(function(e){return t.every(function(t){return!t.test(e[0])})}).map(function(e){return e.join("=")}).join("&"),a.toString()},hashParamName="_sw-precache",urlsToCacheKeys=new Map(precacheConfig.map(function(e){var t=e[0],a=e[1],n=new URL(t,self.location),c=createCacheKey(n,hashParamName,a,!1);return[n.toString(),c]}));self.addEventListener("install",function(e){e.waitUntil(caches.open(cacheName).then(function(e){return setOfCachedUrls(e).then(function(t){return Promise.all(Array.from(urlsToCacheKeys.values()).map(function(a){if(!t.has(a))return e.add(new Request(a,{credentials:"same-origin"}))}))})}).then(function(){return self.skipWaiting()}))}),self.addEventListener("activate",function(e){var t=new Set(urlsToCacheKeys.values());e.waitUntil(caches.open(cacheName).then(function(e){return e.keys().then(function(a){return Promise.all(a.map(function(a){if(!t.has(a.url))return e.delete(a)}))})}).then(function(){return self.clients.claim()}))}),self.addEventListener("fetch",function(e){if("GET"===e.request.method){var t,a=stripIgnoredUrlParameters(e.request.url,ignoreUrlParametersMatching);t=urlsToCacheKeys.has(a);var n="index.html";!t&&n&&(a=addDirectoryIndex(a,n),t=urlsToCacheKeys.has(a));var c="/";!t&&c&&"navigate"===e.request.mode&&isPathWhitelisted(["^((?!(static|api|local|service_worker.js)).)*$"],e.request.url)&&(a=new URL(c,self.location).toString(),t=urlsToCacheKeys.has(a)),t&&e.respondWith(caches.open(cacheName).then(function(e){return e.match(urlsToCacheKeys.get(a))}).catch(function(t){return console.warn('Couldn\'t serve response for "%s" from cache: %O',e.request.url,t),fetch(e.request)}))}});

homeassistant/components/garage_door/rpi_gpio.py

@@ -0,0 +1,96 @@
+"""
+Support for building a Raspberry Pi garage controller in HA.
+
+Instructions for building the controller can be found here
+https://github.com/andrewshilliday/garage-door-controller
+
+For more details about this platform, please refer to the documentation at
+https://home-assistant.io/components/garage_door.rpi_gpio/
+"""
+
+import logging
+from time import sleep
+import voluptuous as vol
+from homeassistant.components.garage_door import GarageDoorDevice
+import homeassistant.components.rpi_gpio as rpi_gpio
+import homeassistant.helpers.config_validation as cv
+
+DEPENDENCIES = ['rpi_gpio']
+
+_LOGGER = logging.getLogger(__name__)
+
+_DOORS_SCHEMA = vol.All(
+    cv.ensure_list,
+    [
+        vol.Schema({
+            'name': str,
+            'relay_pin': int,
+            'state_pin': int,
+        })
+    ]
+)
+PLATFORM_SCHEMA = vol.Schema({
+    'platform': str,
+    vol.Required('doors'): _DOORS_SCHEMA,
+})
+
+
+# pylint: disable=unused-argument
+def setup_platform(hass, config, add_devices, discovery_info=None):
+    """Setup the garage door platform."""
+    doors = []
+    doors_conf = config.get('doors')
+
+    for door in doors_conf:
+        doors.append(RPiGPIOGarageDoor(door['name'], door['relay_pin'],
+                                       door['state_pin']))
+    add_devices(doors)
+
+
+class RPiGPIOGarageDoor(GarageDoorDevice):
+    """Representation of a Raspberry garage door."""
+
+    def __init__(self, name, relay_pin, state_pin):
+        """Initialize the garage door."""
+        self._name = name
+        self._state = False
+        self._relay_pin = relay_pin
+        self._state_pin = state_pin
+        rpi_gpio.setup_output(self._relay_pin)
+        rpi_gpio.setup_input(self._state_pin, 'UP')
+        rpi_gpio.write_output(self._relay_pin, True)
+
+    @property
+    def unique_id(self):
+        """Return the ID of this garage door."""
+        return "{}.{}".format(self.__class__, self._name)
+
+    @property
+    def name(self):
+        """Return the name of the garage door if any."""
+        return self._name
+
+    def update(self):
+        """Update the state of the garage door."""
+        self._state = rpi_gpio.read_input(self._state_pin)
+
+    @property
+    def is_closed(self):
+        """Return true if door is closed."""
+        return self._state
+
+    def _trigger(self):
+        """Trigger the door."""
+        rpi_gpio.write_output(self._relay_pin, False)
+        sleep(0.2)
+        rpi_gpio.write_output(self._relay_pin, True)
+
+    def close_door(self):
+        """Close the door."""
+        if not self.is_closed:
+            self._trigger()
+
+    def open_door(self):
+        """Open the door."""
+        if self.is_closed:
+            self._trigger()

homeassistant/components/garage_door/services.yaml

@@ -0,0 +1,15 @@
+open:
+  description: Open all or specified garage door
+
+  fields:
+    entity_id:
+      description: Name(s) of garage door(s) to open
+      example: 'garage.main'
+
+close:
+  description: Close all or a specified garage door
+
+  fields:
+    entity_id:
+      description: Name(s) of garage door(s) to close
+      example: 'garage.main'

homeassistant/components/garage_door/wink.py

@@ -7,9 +7,10 @@ https://home-assistant.io/components/garage_door.wink/
 import logging
 
 from homeassistant.components.garage_door import GarageDoorDevice
-from homeassistant.const import CONF_ACCESS_TOKEN, ATTR_BATTERY_LEVEL
+from homeassistant.components.wink import WinkDevice
+from homeassistant.const import CONF_ACCESS_TOKEN
 
-REQUIREMENTS = ['python-wink==0.7.7']
+REQUIREMENTS = ['python-wink==0.7.11', 'pubnub==3.8.2']
 
 
 def setup_platform(hass, config, add_devices, discovery_info=None):
@@ -31,38 +32,18 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
                 pywink.get_garage_doors())
 
 
-class WinkGarageDoorDevice(GarageDoorDevice):
+class WinkGarageDoorDevice(WinkDevice, GarageDoorDevice):
     """Representation of a Wink garage door."""
 
     def __init__(self, wink):
         """Initialize the garage door."""
-        self.wink = wink
-        self._battery = self.wink.battery_level
-
-    @property
-    def unique_id(self):
-        """Return the ID of this wink garage door."""
-        return "{}.{}".format(self.__class__, self.wink.device_id())
-
-    @property
-    def name(self):
-        """Return the name of the garage door if any."""
-        return self.wink.name()
-
-    def update(self):
-        """Update the state of the garage door."""
-        self.wink.update_state()
+        WinkDevice.__init__(self, wink)
 
     @property
     def is_closed(self):
         """Return true if door is closed."""
         return self.wink.state() == 0
 
-    @property
-    def available(self):
-        """True if connection == True."""
-        return self.wink.available
-
     def close_door(self):
         """Close the door."""
         self.wink.set_state(0)
@@ -70,16 +51,3 @@ 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

homeassistant/components/garage_door/zwave.py

@@ -0,0 +1,70 @@
+"""
+Support for Zwave garage door components.
+
+For more details about this platform, please refer to the documentation
+https://home-assistant.io/components/garagedoor.zwave/
+"""
+# Because we do not compile openzwave on CI
+# pylint: disable=import-error
+import logging
+from homeassistant.components.garage_door import DOMAIN
+from homeassistant.components.zwave import ZWaveDeviceEntity
+from homeassistant.components import zwave
+from homeassistant.components.garage_door import GarageDoorDevice
+
+COMMAND_CLASS_SWITCH_BINARY = 0x25  # 37
+COMMAND_CLASS_BARRIER_OPERATOR = 0x66  # 102
+_LOGGER = logging.getLogger(__name__)
+
+
+def setup_platform(hass, config, add_devices, discovery_info=None):
+    """Find and return Z-Wave garage door device."""
+    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_SWITCH_BINARY and \
+       value.command_class != zwave.COMMAND_CLASS_BARRIER_OPERATOR:
+        return
+    if value.type != zwave.TYPE_BOOL:
+        return
+    if value.genre != zwave.GENRE_USER:
+        return
+
+    value.set_change_verified(False)
+    add_devices([ZwaveGarageDoor(value)])
+
+
+class ZwaveGarageDoor(zwave.ZWaveDeviceEntity, GarageDoorDevice):
+    """Representation of an Zwave garage door device."""
+
+    def __init__(self, value):
+        """Initialize the zwave garage door."""
+        from openzwave.network import ZWaveNetwork
+        from pydispatch import dispatcher
+        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()
+            _LOGGER.debug("Value changed on network %s", value)
+
+    @property
+    def is_closed(self):
+        """Return the current position of Zwave garage door."""
+        return not self._state
+
+    def close_door(self):
+        """Close the garage door."""
+        self._value.data = False
+
+    def open_door(self):
+        """Open the garage door."""
+        self._value.data = True

homeassistant/components/group.py

@@ -12,10 +12,9 @@ import voluptuous as vol
 import homeassistant.core as ha
 from homeassistant.const import (
     ATTR_ENTITY_ID, CONF_ICON, CONF_NAME, STATE_CLOSED, STATE_HOME,
-    STATE_NOT_HOME, STATE_OFF, STATE_ON, STATE_OPEN, STATE_UNKNOWN,
-    ATTR_ASSUMED_STATE, )
-from homeassistant.helpers.entity import (
-    Entity, generate_entity_id, split_entity_id)
+    STATE_NOT_HOME, STATE_OFF, STATE_ON, STATE_OPEN, STATE_LOCKED,
+    STATE_UNLOCKED, STATE_UNKNOWN, ATTR_ASSUMED_STATE)
+from homeassistant.helpers.entity import Entity, generate_entity_id
 from homeassistant.helpers.event import track_state_change
 import homeassistant.helpers.config_validation as cv
 
@@ -64,7 +63,7 @@ CONFIG_SCHEMA = vol.Schema({
 
 # List of ON/OFF state tuples for groupable states
 _GROUP_TYPES = [(STATE_ON, STATE_OFF), (STATE_HOME, STATE_NOT_HOME),
-                (STATE_OPEN, STATE_CLOSED)]
+                (STATE_OPEN, STATE_CLOSED), (STATE_LOCKED, STATE_UNLOCKED)]
 
 
 def _get_group_on_off(state):
@@ -101,7 +100,7 @@ def expand_entity_ids(hass, entity_ids):
 
         try:
             # If entity_id points at a group, expand it
-            domain, _ = split_entity_id(entity_id)
+            domain, _ = ha.split_entity_id(entity_id)
 
             if domain == DOMAIN:
                 found_ids.extend(
@@ -304,8 +303,9 @@ class Group(Entity):
             if gr_on is None:
                 return
 
-            if tr_state is None or (gr_state == gr_on and
-                                    tr_state.state == gr_off):
+            if tr_state is None or ((gr_state == gr_on and
+                                     tr_state.state == gr_off) or
+                                    tr_state.state not in (gr_on, gr_off)):
                 if states is None:
                     states = self._tracking_states
 

homeassistant/components/hdmi_cec.py

@@ -0,0 +1,122 @@
+"""
+CEC component.
+
+Requires libcec + Python bindings.
+"""
+
+import logging
+import voluptuous as vol
+from homeassistant.const import EVENT_HOMEASSISTANT_START
+import homeassistant.helpers.config_validation as cv
+
+
+_LOGGER = logging.getLogger(__name__)
+_CEC = None
+DOMAIN = 'hdmi_cec'
+SERVICE_SELECT_DEVICE = 'select_device'
+SERVICE_POWER_ON = 'power_on'
+SERVICE_STANDBY = 'standby'
+CONF_DEVICES = 'devices'
+ATTR_DEVICE = 'device'
+MAX_DEPTH = 4
+
+
+# pylint: disable=unnecessary-lambda
+DEVICE_SCHEMA = vol.Schema({
+    vol.All(cv.positive_int): vol.Any(lambda devices: DEVICE_SCHEMA(devices),
+                                      cv.string)
+})
+
+
+CONFIG_SCHEMA = vol.Schema({
+    DOMAIN: vol.Schema({
+        vol.Required(CONF_DEVICES): DEVICE_SCHEMA
+    })
+}, extra=vol.ALLOW_EXTRA)
+
+
+def parse_mapping(mapping, parents=None):
+    """Parse configuration device mapping."""
+    if parents is None:
+        parents = []
+    for addr, val in mapping.items():
+        cur = parents + [str(addr)]
+        if isinstance(val, dict):
+            yield from parse_mapping(val, cur)
+        elif isinstance(val, str):
+            yield (val, cur)
+
+
+def pad_physical_address(addr):
+    """Right-pad a physical address."""
+    return addr + ['0'] * (MAX_DEPTH - len(addr))
+
+
+def setup(hass, config):
+    """Setup CEC capability."""
+    global _CEC
+
+    # cec is only available if libcec is properly installed
+    # and the Python bindings are accessible.
+    try:
+        import cec
+    except ImportError:
+        _LOGGER.error("libcec must be installed")
+        return False
+
+    # Parse configuration into a dict of device name
+    # to physical address represented as a list of
+    # four elements.
+    flat = {}
+    for pair in parse_mapping(config[DOMAIN].get(CONF_DEVICES, {})):
+        flat[pair[0]] = pad_physical_address(pair[1])
+
+    # Configure libcec.
+    cfg = cec.libcec_configuration()
+    cfg.strDeviceName = 'HASS'
+    cfg.bActivateSource = 0
+    cfg.bMonitorOnly = 1
+    cfg.clientVersion = cec.LIBCEC_VERSION_CURRENT
+
+    # Set up CEC adapter.
+    _CEC = cec.ICECAdapter.Create(cfg)
+
+    def _power_on(call):
+        """Power on all devices."""
+        _CEC.PowerOnDevices()
+
+    def _standby(call):
+        """Standby all devices."""
+        _CEC.StandbyDevices()
+
+    def _select_device(call):
+        """Select the active device."""
+        path = flat.get(call.data[ATTR_DEVICE])
+        if not path:
+            _LOGGER.error("Device not found: %s", call.data[ATTR_DEVICE])
+        cmds = []
+        for i in range(1, MAX_DEPTH - 1):
+            addr = pad_physical_address(path[:i])
+            cmds.append('1f:82:{}{}:{}{}'.format(*addr))
+            cmds.append('1f:86:{}{}:{}{}'.format(*addr))
+        for cmd in cmds:
+            _CEC.Transmit(_CEC.CommandFromString(cmd))
+        _LOGGER.info("Selected %s", call.data[ATTR_DEVICE])
+
+    def _start_cec(event):
+        """Open CEC adapter."""
+        adapters = _CEC.DetectAdapters()
+        if len(adapters) == 0:
+            _LOGGER.error("No CEC adapter found")
+            return
+
+        if _CEC.Open(adapters[0].strComName):
+            hass.services.register(DOMAIN, SERVICE_POWER_ON, _power_on)
+            hass.services.register(DOMAIN, SERVICE_STANDBY, _standby)
+            hass.services.register(DOMAIN, SERVICE_SELECT_DEVICE,
+                                   _select_device)
+        else:
+            _LOGGER.error("Failed to open adapter")
+
+    hass.bus.listen_once(EVENT_HOMEASSISTANT_START, _start_cec)
+    return True

homeassistant/components/history.py

@@ -4,13 +4,13 @@ Provide pre-made queries on top of the recorder component.
 For more details about this component, please refer to the documentation at
 https://home-assistant.io/components/history/
 """
-import re
 from collections import defaultdict
 from datetime import timedelta
 from itertools import groupby
 
-from homeassistant.components import recorder, script
 import homeassistant.util.dt as dt_util
+from homeassistant.components import recorder, script
+from homeassistant.components.frontend import register_built_in_panel
 from homeassistant.components.http import HomeAssistantView
 
 DOMAIN = 'history'
@@ -19,21 +19,17 @@ DEPENDENCIES = ['recorder', 'http']
 SIGNIFICANT_DOMAINS = ('thermostat',)
 IGNORE_DOMAINS = ('zone', 'scene',)
 
-URL_HISTORY_PERIOD = re.compile(
-    r'/api/history/period(?:/(?P<date>\d{4}-\d{1,2}-\d{1,2})|)')
-
 
 def last_5_states(entity_id):
     """Return the last 5 states for entity_id."""
     entity_id = entity_id.lower()
 
-    query = """
-        SELECT * FROM states WHERE entity_id=? AND
-        last_changed=last_updated
-        ORDER BY state_id DESC LIMIT 0, 5
-    """
-
-    return recorder.query_states(query, (entity_id, ))
+    states = recorder.get_model('States')
+    return recorder.execute(
+        recorder.query('States').filter(
+            (states.entity_id == entity_id) &
+            (states.last_changed == states.last_updated)
+        ).order_by(states.state_id.desc()).limit(5))
 
 
 def get_significant_states(start_time, end_time=None, entity_id=None):
@@ -44,48 +40,42 @@ def get_significant_states(start_time, end_time=None, entity_id=None):
     as well as all states from certain domains (for instance
     thermostat so that we get current temperature in our graphs).
     """
-    where = """
-        (domain IN ({}) OR last_changed=last_updated)
-        AND domain NOT IN ({}) AND last_updated > ?
-    """.format(",".join("'%s'" % x for x in SIGNIFICANT_DOMAINS),
-               ",".join("'%s'" % x for x in IGNORE_DOMAINS))
-
-    data = [start_time]
+    states = recorder.get_model('States')
+    query = recorder.query('States').filter(
+        (states.domain.in_(SIGNIFICANT_DOMAINS) |
+         (states.last_changed == states.last_updated)) &
+        ((~states.domain.in_(IGNORE_DOMAINS)) &
+         (states.last_updated > start_time)))
 
     if end_time is not None:
-        where += "AND last_updated < ? "
-        data.append(end_time)
+        query = query.filter(states.last_updated < end_time)
 
     if entity_id is not None:
-        where += "AND entity_id = ? "
-        data.append(entity_id.lower())
+        query = query.filter_by(entity_id=entity_id.lower())
 
-    query = ("SELECT * FROM states WHERE {} "
-             "ORDER BY entity_id, last_updated ASC").format(where)
-
-    states = (state for state in recorder.query_states(query, data)
-              if _is_significant(state))
+    states = (
+        state for state in recorder.execute(
+            query.order_by(states.entity_id, states.last_updated))
+        if _is_significant(state))
 
     return states_to_json(states, start_time, entity_id)
 
 
 def state_changes_during_period(start_time, end_time=None, entity_id=None):
     """Return states changes during UTC period start_time - end_time."""
-    where = "last_changed=last_updated AND last_changed > ? "
-    data = [start_time]
+    states = recorder.get_model('States')
+    query = recorder.query('States').filter(
+        (states.last_changed == states.last_updated) &
+        (states.last_changed > start_time))
 
     if end_time is not None:
-        where += "AND last_changed < ? "
-        data.append(end_time)
+        query = query.filter(states.last_updated < end_time)
 
     if entity_id is not None:
-        where += "AND entity_id = ? "
-        data.append(entity_id.lower())
+        query = query.filter_by(entity_id=entity_id.lower())
 
-    query = ("SELECT * FROM states WHERE {} "
-             "ORDER BY entity_id, last_changed ASC").format(where)
-
-    states = recorder.query_states(query, data)
+    states = recorder.execute(
+        query.order_by(states.entity_id, states.last_updated))
 
     return states_to_json(states, start_time, entity_id)
 
@@ -99,24 +89,27 @@ def get_states(utc_point_in_time, entity_ids=None, run=None):
         if run is None:
             return []
 
-    where = run.where_after_start_run + "AND created < ? "
-    where_data = [utc_point_in_time]
+    from sqlalchemy import and_, func
+
+    states = recorder.get_model('States')
+    most_recent_state_ids = recorder.query(
+        func.max(states.state_id).label('max_state_id')
+    ).filter(
+        (states.created >= run.start) &
+        (states.created < utc_point_in_time)
+    )
 
     if entity_ids is not None:
-        where += "AND entity_id IN ({}) ".format(
-            ",".join(['?'] * len(entity_ids)))
-        where_data.extend(entity_ids)
+        most_recent_state_ids = most_recent_state_ids.filter(
+            states.entity_id.in_(entity_ids))
 
-    query = """
-        SELECT * FROM states
-        INNER JOIN (
-            SELECT max(state_id) AS max_state_id
-            FROM states WHERE {}
-            GROUP BY entity_id)
-        WHERE state_id = max_state_id
-    """.format(where)
+    most_recent_state_ids = most_recent_state_ids.group_by(
+        states.entity_id).subquery()
 
-    return recorder.query_states(query, where_data)
+    query = recorder.query('States').join(most_recent_state_ids, and_(
+        states.state_id == most_recent_state_ids.c.max_state_id))
+
+    return recorder.execute(query)
 
 
 def states_to_json(states, start_time, entity_id):
@@ -157,6 +150,7 @@ def setup(hass, config):
     """Setup the history hooks."""
     hass.wsgi.register_view(Last5StatesView)
     hass.wsgi.register_view(HistoryPeriodView)
+    register_built_in_panel(hass, 'history', 'History', 'mdi:poll-box')
 
     return True
 
@@ -177,14 +171,14 @@ class HistoryPeriodView(HomeAssistantView):
 
     url = '/api/history/period'
     name = 'api:history:view-period'
-    extra_urls = ['/api/history/period/<date:date>']
+    extra_urls = ['/api/history/period/<datetime:datetime>']
 
-    def get(self, request, date=None):
+    def get(self, request, datetime=None):
         """Return history over a period of time."""
         one_day = timedelta(days=1)
 
-        if date:
-            start_time = dt_util.as_utc(dt_util.start_of_local_day(date))
+        if datetime:
+            start_time = dt_util.as_utc(datetime)
         else:
             start_time = dt_util.utcnow() - one_day
 

homeassistant/components/homematic.py

@@ -0,0 +1,625 @@
+"""
+Support for Homematic devices.
+
+For more details about this component, please refer to the documentation at
+https://home-assistant.io/components/homematic/
+"""
+import os
+import time
+import logging
+from functools import partial
+import voluptuous as vol
+
+from homeassistant.const import (EVENT_HOMEASSISTANT_STOP, STATE_UNKNOWN,
+                                 CONF_USERNAME, CONF_PASSWORD)
+from homeassistant.helpers.entity import Entity
+from homeassistant.helpers import discovery
+from homeassistant.config import load_yaml_config_file
+
+DOMAIN = 'homematic'
+REQUIREMENTS = ["pyhomematic==0.1.11"]
+
+HOMEMATIC = None
+HOMEMATIC_LINK_DELAY = 0.5
+
+DISCOVER_SWITCHES = 'homematic.switch'
+DISCOVER_LIGHTS = 'homematic.light'
+DISCOVER_SENSORS = 'homematic.sensor'
+DISCOVER_BINARY_SENSORS = 'homematic.binary_sensor'
+DISCOVER_ROLLERSHUTTER = 'homematic.rollershutter'
+DISCOVER_THERMOSTATS = 'homematic.thermostat'
+
+ATTR_DISCOVER_DEVICES = 'devices'
+ATTR_PARAM = 'param'
+ATTR_CHANNEL = 'channel'
+ATTR_NAME = 'name'
+ATTR_ADDRESS = 'address'
+
+EVENT_KEYPRESS = 'homematic.keypress'
+EVENT_IMPULSE = 'homematic.impulse'
+
+SERVICE_VIRTUALKEY = 'virtualkey'
+
+HM_DEVICE_TYPES = {
+    DISCOVER_SWITCHES: ['Switch', 'SwitchPowermeter'],
+    DISCOVER_LIGHTS: ['Dimmer'],
+    DISCOVER_SENSORS: ['SwitchPowermeter', 'Motion', 'MotionV2',
+                       'RemoteMotion', 'ThermostatWall', 'AreaThermostat',
+                       'RotaryHandleSensor', 'WaterSensor', 'PowermeterGas',
+                       'LuxSensor'],
+    DISCOVER_THERMOSTATS: ['Thermostat', 'ThermostatWall', 'MAXThermostat'],
+    DISCOVER_BINARY_SENSORS: ['ShutterContact', 'Smoke', 'SmokeV2', 'Motion',
+                              'MotionV2', 'RemoteMotion'],
+    DISCOVER_ROLLERSHUTTER: ['Blind']
+}
+
+HM_IGNORE_DISCOVERY_NODE = [
+    'ACTUAL_TEMPERATURE'
+]
+
+HM_ATTRIBUTE_SUPPORT = {
+    'LOWBAT': ['Battery', {0: 'High', 1: 'Low'}],
+    'ERROR': ['Sabotage', {0: 'No', 1: 'Yes'}],
+    'RSSI_DEVICE': ['RSSI', {}],
+    'VALVE_STATE': ['Valve', {}],
+    'BATTERY_STATE': ['Battery', {}],
+    'CONTROL_MODE': ['Mode', {0: 'Auto', 1: 'Manual', 2: 'Away', 3: 'Boost'}],
+    'POWER': ['Power', {}],
+    'CURRENT': ['Current', {}],
+    'VOLTAGE': ['Voltage', {}]
+}
+
+HM_PRESS_EVENTS = [
+    'PRESS_SHORT',
+    'PRESS_LONG',
+    'PRESS_CONT',
+    'PRESS_LONG_RELEASE'
+]
+
+HM_IMPULSE_EVENTS = [
+    'SEQUENCE_OK'
+]
+
+_LOGGER = logging.getLogger(__name__)
+
+CONF_RESOLVENAMES_OPTIONS = [
+    'metadata',
+    'json',
+    'xml',
+    False
+]
+
+CONF_LOCAL_IP = 'local_ip'
+CONF_LOCAL_PORT = 'local_port'
+CONF_REMOTE_IP = 'remote_ip'
+CONF_REMOTE_PORT = 'remote_port'
+CONF_RESOLVENAMES = 'resolvenames'
+CONF_DELAY = 'delay'
+
+PLATFORM_SCHEMA = vol.Schema({
+    vol.Required(CONF_LOCAL_IP): vol.Coerce(str),
+    vol.Optional(CONF_LOCAL_PORT, default=8943):
+        vol.All(vol.Coerce(int),
+                vol.Range(min=1, max=65535)),
+    vol.Required(CONF_REMOTE_IP): vol.Coerce(str),
+    vol.Optional(CONF_REMOTE_PORT, default=2001):
+        vol.All(vol.Coerce(int),
+                vol.Range(min=1, max=65535)),
+    vol.Optional(CONF_RESOLVENAMES, default=False):
+        vol.In(CONF_RESOLVENAMES_OPTIONS),
+    vol.Optional(CONF_USERNAME, default="Admin"): vol.Coerce(str),
+    vol.Optional(CONF_PASSWORD, default=""): vol.Coerce(str),
+    vol.Optional(CONF_DELAY, default=0.5): vol.Coerce(float)
+})
+
+SCHEMA_SERVICE_VIRTUALKEY = vol.Schema({
+    vol.Required(ATTR_ADDRESS): vol.Coerce(str),
+    vol.Required(ATTR_CHANNEL): vol.Coerce(int),
+    vol.Required(ATTR_PARAM): vol.Coerce(str)
+})
+
+
+# pylint: disable=unused-argument
+def setup(hass, config):
+    """Setup the Homematic component."""
+    global HOMEMATIC, HOMEMATIC_LINK_DELAY
+
+    from pyhomematic import HMConnection
+
+    local_ip = config[DOMAIN][0].get(CONF_LOCAL_IP)
+    local_port = config[DOMAIN][0].get(CONF_LOCAL_PORT)
+    remote_ip = config[DOMAIN][0].get(CONF_REMOTE_IP)
+    remote_port = config[DOMAIN][0].get(CONF_REMOTE_PORT)
+    resolvenames = config[DOMAIN][0].get(CONF_RESOLVENAMES)
+    username = config[DOMAIN][0].get(CONF_USERNAME)
+    password = config[DOMAIN][0].get(CONF_PASSWORD)
+    HOMEMATIC_LINK_DELAY = config[DOMAIN][0].get(CONF_DELAY)
+
+    if remote_ip is None or local_ip is None:
+        _LOGGER.error("Missing remote CCU/Homegear or local address")
+        return False
+
+    # Create server thread
+    bound_system_callback = partial(system_callback_handler, hass, config)
+    HOMEMATIC = HMConnection(local=local_ip,
+                             localport=local_port,
+                             remote=remote_ip,
+                             remoteport=remote_port,
+                             systemcallback=bound_system_callback,
+                             resolvenames=resolvenames,
+                             rpcusername=username,
+                             rpcpassword=password,
+                             interface_id="homeassistant")
+
+    # Start server thread, connect to peer, initialize to receive events
+    HOMEMATIC.start()
+
+    # Stops server when Homeassistant is shutting down
+    hass.bus.listen_once(EVENT_HOMEASSISTANT_STOP, HOMEMATIC.stop)
+    hass.config.components.append(DOMAIN)
+
+    # regeister homematic services
+    descriptions = load_yaml_config_file(
+        os.path.join(os.path.dirname(__file__), 'services.yaml'))
+
+    hass.services.register(DOMAIN, SERVICE_VIRTUALKEY,
+                           _hm_service_virtualkey,
+                           descriptions[DOMAIN][SERVICE_VIRTUALKEY],
+                           SCHEMA_SERVICE_VIRTUALKEY)
+
+    return True
+
+
+# pylint: disable=too-many-branches
+def system_callback_handler(hass, config, src, *args):
+    """Callback handler."""
+    if src == 'newDevices':
+        _LOGGER.debug("newDevices with: %s", str(args))
+        # pylint: disable=unused-variable
+        (interface_id, dev_descriptions) = args
+        key_dict = {}
+        # Get list of all keys of the devices (ignoring channels)
+        for dev in dev_descriptions:
+            key_dict[dev['ADDRESS'].split(':')[0]] = True
+
+        # Register EVENTS
+        # Search all device with a EVENTNODE that include data
+        bound_event_callback = partial(_hm_event_handler, hass)
+        for dev in key_dict:
+            if dev not in HOMEMATIC.devices:
+                continue
+
+            hmdevice = HOMEMATIC.devices.get(dev)
+            # have events?
+            if len(hmdevice.EVENTNODE) > 0:
+                _LOGGER.debug("Register Events from %s", dev)
+                hmdevice.setEventCallback(callback=bound_event_callback,
+                                          bequeath=True)
+
+        # If configuration allows autodetection of devices,
+        # all devices not configured are added.
+        if key_dict:
+            for component_name, discovery_type in (
+                    ('switch', DISCOVER_SWITCHES),
+                    ('light', DISCOVER_LIGHTS),
+                    ('rollershutter', DISCOVER_ROLLERSHUTTER),
+                    ('binary_sensor', DISCOVER_BINARY_SENSORS),
+                    ('sensor', DISCOVER_SENSORS),
+                    ('thermostat', DISCOVER_THERMOSTATS)):
+                # Get all devices of a specific type
+                found_devices = _get_devices(discovery_type, key_dict)
+
+                # When devices of this type are found
+                # they are setup in HA and an event is fired
+                if found_devices:
+                    # Fire discovery event
+                    discovery.load_platform(hass, component_name, DOMAIN, {
+                        ATTR_DISCOVER_DEVICES: found_devices
+                    }, config)
+
+
+def _get_devices(device_type, keys):
+    """Get the Homematic devices."""
+    # run
+    device_arr = []
+    for key in keys:
+        device = HOMEMATIC.devices[key]
+        class_name = device.__class__.__name__
+        metadata = {}
+
+        # is class supported by discovery type
+        if class_name not in HM_DEVICE_TYPES[device_type]:
+            continue
+
+        # Load metadata if needed to generate a param list
+        if device_type == DISCOVER_SENSORS:
+            metadata.update(device.SENSORNODE)
+        elif device_type == DISCOVER_BINARY_SENSORS:
+            metadata.update(device.BINARYNODE)
+
+        params = _create_params_list(device, metadata, device_type)
+        if params:
+            # Generate options for 1...n elements with 1...n params
+            for channel in range(1, device.ELEMENT + 1):
+                _LOGGER.debug("Handling %s:%i", key, channel)
+                if channel in params:
+                    for param in params[channel]:
+                        name = _create_ha_name(name=device.NAME,
+                                               channel=channel,
+                                               param=param)
+                        device_dict = dict(platform="homematic",
+                                           address=key,
+                                           name=name,
+                                           channel=channel)
+                        if param is not None:
+                            device_dict[ATTR_PARAM] = param
+
+                        # Add new device
+                        device_arr.append(device_dict)
+                else:
+                    _LOGGER.debug("Channel %i not in params", channel)
+        else:
+            _LOGGER.debug("Got no params for %s", key)
+    _LOGGER.debug("%s autodiscovery: %s",
+                  device_type, str(device_arr))
+    return device_arr
+
+
+def _create_params_list(hmdevice, metadata, device_type):
+    """Create a list from HMDevice with all possible parameters in config."""
+    params = {}
+    merge = False
+
+    # use merge?
+    if device_type == DISCOVER_SENSORS:
+        merge = True
+    elif device_type == DISCOVER_BINARY_SENSORS:
+        merge = True
+
+    # Search in sensor and binary metadata per elements
+    for channel in range(1, hmdevice.ELEMENT + 1):
+        param_chan = []
+        for node, meta_chan in metadata.items():
+            try:
+                # Is this attribute ignored?
+                if node in HM_IGNORE_DISCOVERY_NODE:
+                    continue
+                if meta_chan == 'c' or meta_chan is None:
+                    # Only channel linked data
+                    param_chan.append(node)
+                elif channel == 1:
+                    # First channel can have other data channel
+                    param_chan.append(node)
+            except (TypeError, ValueError):
+                _LOGGER.error("Exception generating %s (%s)",
+                              hmdevice.ADDRESS, str(metadata))
+
+        # default parameter is merge is off
+        if len(param_chan) == 0 and not merge:
+            param_chan.append(None)
+
+        # Add to channel
+        if len(param_chan) > 0:
+            params.update({channel: param_chan})
+
+    _LOGGER.debug("Create param list for %s with: %s", hmdevice.ADDRESS,
+                  str(params))
+    return params
+
+
+def _create_ha_name(name, channel, param):
+    """Generate a unique object name."""
+    # HMDevice is a simple device
+    if channel == 1 and param is None:
+        return name
+
+    # Has multiple elements/channels
+    if channel > 1 and param is None:
+        return "{} {}".format(name, channel)
+
+    # With multiple param first elements
+    if channel == 1 and param is not None:
+        return "{} {}".format(name, param)
+
+    # Multiple param on object with multiple elements
+    if channel > 1 and param is not None:
+        return "{} {} {}".format(name, channel, param)
+
+
+def setup_hmdevice_discovery_helper(hmdevicetype, discovery_info,
+                                    add_callback_devices):
+    """Helper to setup Homematic devices with discovery info."""
+    for config in discovery_info[ATTR_DISCOVER_DEVICES]:
+        _LOGGER.debug("Add device %s from config: %s",
+                      str(hmdevicetype), str(config))
+
+        # create object and add to HA
+        new_device = hmdevicetype(config)
+        add_callback_devices([new_device])
+
+        # link to HM
+        new_device.link_homematic()
+
+    return True
+
+
+def _hm_event_handler(hass, device, caller, attribute, value):
+    """Handle all pyhomematic device events."""
+    try:
+        channel = int(device.split(":")[1])
+        address = device.split(":")[0]
+        hmdevice = HOMEMATIC.devices.get(address)
+    except (TypeError, ValueError):
+        _LOGGER.error("Event handling channel convert error!")
+        return
+
+    # is not a event?
+    if attribute not in hmdevice.EVENTNODE:
+        return
+
+    _LOGGER.debug("Event %s for %s channel %i", attribute,
+                  hmdevice.NAME, channel)
+
+    # keypress event
+    if attribute in HM_PRESS_EVENTS:
+        hass.bus.fire(EVENT_KEYPRESS, {
+            ATTR_NAME: hmdevice.NAME,
+            ATTR_PARAM: attribute,
+            ATTR_CHANNEL: channel
+        })
+        return
+
+    # impulse event
+    if attribute in HM_IMPULSE_EVENTS:
+        hass.bus.fire(EVENT_KEYPRESS, {
+            ATTR_NAME: hmdevice.NAME,
+            ATTR_CHANNEL: channel
+        })
+        return
+
+    _LOGGER.warning("Event is unknown and not forwarded to HA")
+
+
+def _hm_service_virtualkey(call):
+    """Callback for handle virtualkey services."""
+    address = call.data.get(ATTR_ADDRESS)
+    channel = call.data.get(ATTR_CHANNEL)
+    param = call.data.get(ATTR_PARAM)
+
+    if address not in HOMEMATIC.devices:
+        _LOGGER.error("%s not found for service virtualkey!", address)
+        return
+    hmdevice = HOMEMATIC.devices.get(address)
+
+    # if param exists for this device
+    if param not in hmdevice.ACTIONNODE:
+        _LOGGER.error("%s not datapoint in hm device %s", param, address)
+        return
+
+    # channel exists?
+    if channel > hmdevice.ELEMENT:
+        _LOGGER.error("%i is not a channel in hm device %s", channel, address)
+        return
+
+    # call key
+    hmdevice.actionNodeData(param, 1, channel)
+
+
+class HMDevice(Entity):
+    """The Homematic device base object."""
+
+    # pylint: disable=too-many-instance-attributes
+    def __init__(self, config):
+        """Initialize a generic Homematic device."""
+        self._name = config.get(ATTR_NAME, None)
+        self._address = config.get(ATTR_ADDRESS, None)
+        self._channel = config.get(ATTR_CHANNEL, 1)
+        self._state = config.get(ATTR_PARAM, None)
+        self._data = {}
+        self._hmdevice = None
+        self._connected = False
+        self._available = False
+
+        # Set param to uppercase
+        if self._state:
+            self._state = self._state.upper()
+
+        # Generate name
+        if not self._name:
+            self._name = _create_ha_name(name=self._address,
+                                         channel=self._channel,
+                                         param=self._state)
+
+    @property
+    def should_poll(self):
+        """Return false. Homematic states are pushed by the XML RPC Server."""
+        return False
+
+    @property
+    def name(self):
+        """Return the name of the device."""
+        return self._name
+
+    @property
+    def assumed_state(self):
+        """Return true if unable to access real state of the device."""
+        return not self._available
+
+    @property
+    def available(self):
+        """Return true if device is available."""
+        return self._available
+
+    @property
+    def device_state_attributes(self):
+        """Return device specific state attributes."""
+        attr = {}
+
+        # no data available to create
+        if not self.available:
+            return attr
+
+        # Generate an attributes list
+        for node, data in HM_ATTRIBUTE_SUPPORT.items():
+            # Is an attributes and exists for this object
+            if node in self._data:
+                value = data[1].get(self._data[node], self._data[node])
+                attr[data[0]] = value
+
+        # static attributes
+        attr["ID"] = self._hmdevice.ADDRESS
+
+        return attr
+
+    def link_homematic(self):
+        """Connect to Homematic."""
+        # device is already linked
+        if self._connected:
+            return True
+
+        # Does a HMDevice from pyhomematic exist?
+        if self._address in HOMEMATIC.devices:
+            # Init
+            self._hmdevice = HOMEMATIC.devices[self._address]
+            self._connected = True
+
+            # Check if Homematic class is okay for HA class
+            _LOGGER.info("Start linking %s to %s", self._address, self._name)
+            if self._check_hm_to_ha_object():
+                try:
+                    # Init datapoints of this object
+                    self._init_data_struct()
+                    if HOMEMATIC_LINK_DELAY:
+                        # We delay / pause loading of data to avoid overloading
+                        # of CCU / Homegear when doing auto detection
+                        time.sleep(HOMEMATIC_LINK_DELAY)
+                    self._load_init_data_from_hm()
+                    _LOGGER.debug("%s datastruct: %s",
+                                  self._name, str(self._data))
+
+                    # Link events from pyhomatic
+                    self._subscribe_homematic_events()
+                    self._available = not self._hmdevice.UNREACH
+                # pylint: disable=broad-except
+                except Exception as err:
+                    self._connected = False
+                    _LOGGER.error("Exception while linking %s: %s",
+                                  self._address, str(err))
+            else:
+                _LOGGER.critical("Delink %s object from HM", self._name)
+                self._connected = False
+
+            # Update HA
+            _LOGGER.debug("%s linking done, send update_ha_state", self._name)
+            self.update_ha_state()
+        else:
+            _LOGGER.debug("%s not found in HOMEMATIC.devices", self._address)
+
+    def _hm_event_callback(self, device, caller, attribute, value):
+        """Handle all pyhomematic device events."""
+        _LOGGER.debug("%s received event '%s' value: %s", self._name,
+                      attribute, value)
+        have_change = False
+
+        # Is data needed for this instance?
+        if attribute in self._data:
+            # Did data change?
+            if self._data[attribute] != value:
+                self._data[attribute] = value
+                have_change = True
+
+        # If available it has changed
+        if attribute is "UNREACH":
+            self._available = bool(value)
+            have_change = True
+
+        # If it has changed data point, update HA
+        if have_change:
+            _LOGGER.debug("%s update_ha_state after '%s'", self._name,
+                          attribute)
+            self.update_ha_state()
+
+    def _subscribe_homematic_events(self):
+        """Subscribe all required events to handle job."""
+        channels_to_sub = {}
+
+        # Push data to channels_to_sub from hmdevice metadata
+        for metadata in (self._hmdevice.SENSORNODE, self._hmdevice.BINARYNODE,
+                         self._hmdevice.ATTRIBUTENODE,
+                         self._hmdevice.WRITENODE, self._hmdevice.EVENTNODE,
+                         self._hmdevice.ACTIONNODE):
+            for node, channel in metadata.items():
+                # Data is needed for this instance
+                if node in self._data:
+                    # chan is current channel
+                    if channel == 'c' or channel is None:
+                        channel = self._channel
+                    # Prepare for subscription
+                    try:
+                        if int(channel) >= 0:
+                            channels_to_sub.update({int(channel): True})
+                    except (ValueError, TypeError):
+                        _LOGGER("Invalid channel in metadata from %s",
+                                self._name)
+
+        # Set callbacks
+        for channel in channels_to_sub:
+            _LOGGER.debug("Subscribe channel %s from %s",
+                          str(channel), self._name)
+            self._hmdevice.setEventCallback(callback=self._hm_event_callback,
+                                            bequeath=False,
+                                            channel=channel)
+
+    def _load_init_data_from_hm(self):
+        """Load first value from pyhomematic."""
+        if not self._connected:
+            return False
+
+        # Read data from pyhomematic
+        for metadata, funct in (
+                (self._hmdevice.ATTRIBUTENODE,
+                 self._hmdevice.getAttributeData),
+                (self._hmdevice.WRITENODE, self._hmdevice.getWriteData),
+                (self._hmdevice.SENSORNODE, self._hmdevice.getSensorData),
+                (self._hmdevice.BINARYNODE, self._hmdevice.getBinaryData)):
+            for node in metadata:
+                if node in self._data:
+                    self._data[node] = funct(name=node, channel=self._channel)
+
+        return True
+
+    def _hm_set_state(self, value):
+        """Set data to main datapoint."""
+        if self._state in self._data:
+            self._data[self._state] = value
+
+    def _hm_get_state(self):
+        """Get data from main datapoint."""
+        if self._state in self._data:
+            return self._data[self._state]
+        return None
+
+    def _check_hm_to_ha_object(self):
+        """Check if it is possible to use the Homematic object as this HA type.
+
+        NEEDS overwrite by inherit!
+        """
+        if not self._connected or self._hmdevice is None:
+            _LOGGER.error("HA object is not linked to homematic.")
+            return False
+
+        # Check if button option is correctly set for this object
+        if self._channel > self._hmdevice.ELEMENT:
+            _LOGGER.critical("Button option is not correct for this object!")
+            return False
+
+        return True
+
+    def _init_data_struct(self):
+        """Generate a data dict (self._data) from the Homematic metadata.
+
+        NEEDS overwrite by inherit!
+        """
+        # Add all attributes to data dict
+        for data_note in self._hmdevice.ATTRIBUTENODE:
+            self._data.update({data_note: STATE_UNKNOWN})

homeassistant/components/http.py

@@ -1,25 +1,31 @@
-"""This module provides WSGI application to serve the Home Assistant API."""
+"""
+This module provides WSGI application to serve the Home Assistant API.
+
+For more details about this component, please refer to the documentation at
+https://home-assistant.io/components/http/
+"""
 import hmac
 import json
 import logging
 import mimetypes
 import threading
 import re
+import ssl
 import voluptuous as vol
 
-import homeassistant.core as ha
 import homeassistant.remote as rem
 from homeassistant import util
 from homeassistant.const import (
     SERVER_PORT, HTTP_HEADER_HA_AUTH, HTTP_HEADER_CACHE_CONTROL,
     HTTP_HEADER_ACCESS_CONTROL_ALLOW_ORIGIN,
-    HTTP_HEADER_ACCESS_CONTROL_ALLOW_HEADERS, ALLOWED_CORS_HEADERS)
-from homeassistant.helpers.entity import split_entity_id
+    HTTP_HEADER_ACCESS_CONTROL_ALLOW_HEADERS, ALLOWED_CORS_HEADERS,
+    EVENT_HOMEASSISTANT_STOP, EVENT_HOMEASSISTANT_START)
+from homeassistant.core import split_entity_id
 import homeassistant.util.dt as dt_util
 import homeassistant.helpers.config_validation as cv
 
 DOMAIN = "http"
-REQUIREMENTS = ("eventlet==0.19.0", "static3==0.7.0", "Werkzeug==0.11.5",)
+REQUIREMENTS = ("cherrypy==7.1.0", "static3==0.7.0", "Werkzeug==0.11.10")
 
 CONF_API_PASSWORD = "api_password"
 CONF_SERVER_HOST = "server_host"
@@ -31,6 +37,27 @@ CONF_CORS_ORIGINS = 'cors_allowed_origins'
 
 DATA_API_PASSWORD = 'api_password'
 
+# TLS configuation follows the best-practice guidelines
+# specified here: https://wiki.mozilla.org/Security/Server_Side_TLS
+# Intermediate guidelines are followed.
+SSL_VERSION = ssl.PROTOCOL_SSLv23
+SSL_OPTS = ssl.OP_NO_SSLv2 | ssl.OP_NO_SSLv3
+if hasattr(ssl, 'OP_NO_COMPRESSION'):
+    SSL_OPTS |= ssl.OP_NO_COMPRESSION
+CIPHERS = "ECDHE-ECDSA-CHACHA20-POLY1305:ECDHE-RSA-CHACHA20-POLY1305:" \
+          "ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES128-GCM-SHA256:" \
+          "ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-GCM-SHA384:" \
+          "DHE-RSA-AES128-GCM-SHA256:DHE-RSA-AES256-GCM-SHA384:" \
+          "ECDHE-ECDSA-AES128-SHA256:ECDHE-RSA-AES128-SHA256:" \
+          "ECDHE-ECDSA-AES128-SHA:ECDHE-RSA-AES256-SHA384:" \
+          "ECDHE-RSA-AES128-SHA:ECDHE-ECDSA-AES256-SHA384:" \
+          "ECDHE-ECDSA-AES256-SHA:ECDHE-RSA-AES256-SHA:" \
+          "DHE-RSA-AES128-SHA256:DHE-RSA-AES128-SHA:DHE-RSA-AES256-SHA256:" \
+          "DHE-RSA-AES256-SHA:ECDHE-ECDSA-DES-CBC3-SHA:" \
+          "ECDHE-RSA-DES-CBC3-SHA:EDH-RSA-DES-CBC3-SHA:AES128-GCM-SHA256:" \
+          "AES256-GCM-SHA384:AES128-SHA256:AES256-SHA256:AES128-SHA:" \
+          "AES256-SHA:DES-CBC3-SHA:!DSS"
+
 _FINGERPRINT = re.compile(r'^(.+)-[a-z0-9]{32}\.(\w+)$', re.IGNORECASE)
 
 _LOGGER = logging.getLogger(__name__)
@@ -93,11 +120,17 @@ def setup(hass, config):
         cors_origins=cors_origins
     )
 
-    hass.bus.listen_once(
-        ha.EVENT_HOMEASSISTANT_START,
-        lambda event:
-        threading.Thread(target=server.start, daemon=True,
-                         name='WSGI-server').start())
+    def start_wsgi_server(event):
+        """Start the WSGI server."""
+        server.start()
+
+    hass.bus.listen_once(EVENT_HOMEASSISTANT_START, start_wsgi_server)
+
+    def stop_wsgi_server(event):
+        """Stop the WSGI server."""
+        server.stop()
+
+    hass.bus.listen_once(EVENT_HOMEASSISTANT_STOP, stop_wsgi_server)
 
     hass.wsgi = server
     hass.config.api = rem.API(server_host if server_host != '0.0.0.0'
@@ -183,9 +216,29 @@ def routing_map(hass):
             """Convert date to url value."""
             return value.isoformat()
 
+    class DateTimeValidator(BaseConverter):
+        """Validate datetimes in urls formatted per ISO 8601."""
+
+        regex = r'\d{4}-[01]\d-[0-3]\dT[0-2]\d:[0-5]\d:[0-5]\d' \
+            r'\.\d+([+-][0-2]\d:[0-5]\d|Z)'
+
+        def to_python(self, value):
+            """Validate and convert date."""
+            parsed = dt_util.parse_datetime(value)
+
+            if parsed is None:
+                raise ValidationError()
+
+            return parsed
+
+        def to_url(self, value):
+            """Convert date to url value."""
+            return value.isoformat()
+
     return Map(converters={
         'entity': EntityValidator,
         'date': DateValidator,
+        'datetime': DateTimeValidator,
     })
 
 
@@ -216,6 +269,7 @@ class HomeAssistantWSGI(object):
         self.server_port = server_port
         self.cors_origins = cors_origins
         self.event_forwarder = None
+        self.server = None
 
     def register_view(self, view):
         """Register a view with the WSGI server.
@@ -283,14 +337,34 @@ class HomeAssistantWSGI(object):
 
     def start(self):
         """Start the wsgi server."""
-        from eventlet import wsgi
-        import eventlet
+        from cherrypy import wsgiserver
+        from cherrypy.wsgiserver.ssl_builtin import BuiltinSSLAdapter
+
+        # pylint: disable=too-few-public-methods,super-init-not-called
+        class ContextSSLAdapter(BuiltinSSLAdapter):
+            """SSL Adapter that takes in an SSL context."""
+
+            def __init__(self, context):
+                self.context = context
+
+        # pylint: disable=no-member
+        self.server = wsgiserver.CherryPyWSGIServer(
+            (self.server_host, self.server_port), self,
+            server_name='Home Assistant')
 
-        sock = eventlet.listen((self.server_host, self.server_port))
         if self.ssl_certificate:
-            sock = eventlet.wrap_ssl(sock, certfile=self.ssl_certificate,
-                                     keyfile=self.ssl_key, server_side=True)
-        wsgi.server(sock, self, log=_LOGGER)
+            context = ssl.SSLContext(SSL_VERSION)
+            context.options |= SSL_OPTS
+            context.set_ciphers(CIPHERS)
+            context.load_cert_chain(self.ssl_certificate, self.ssl_key)
+            self.server.ssl_adapter = ContextSSLAdapter(context)
+
+        threading.Thread(target=self.server.start, daemon=True,
+                         name='WSGI-server').start()
+
+    def stop(self):
+        """Stop the wsgi server."""
+        self.server.stop()
 
     def dispatch_request(self, request):
         """Handle incoming request."""
@@ -337,6 +411,10 @@ class HomeAssistantWSGI(object):
         """Handle a request for base app + extra apps."""
         from werkzeug.wsgi import DispatcherMiddleware
 
+        if not self.hass.is_running:
+            from werkzeug.exceptions import BadRequest
+            return BadRequest()(environ, start_response)
+
         app = DispatcherMiddleware(self.base_app, self.extra_apps)
         # Strip out any cachebusting MD5 fingerprints
         fingerprinted = _FINGERPRINT.match(environ.get('PATH_INFO', ''))
@@ -375,6 +453,10 @@ class HomeAssistantView(object):
         """Handle request to url."""
         from werkzeug.exceptions import MethodNotAllowed, Unauthorized
 
+        if request.method == "OPTIONS":
+            # For CORS preflight requests.
+            return self.options(request)
+
         try:
             handler = getattr(self, request.method.lower())
         except AttributeError:
@@ -396,10 +478,15 @@ class HomeAssistantView(object):
             authenticated = True
 
         if self.requires_auth and not authenticated:
+            _LOGGER.warning('Login attempt or request with an invalid'
+                            'password from %s', request.remote_addr)
             raise Unauthorized()
 
         request.authenticated = authenticated
 
+        _LOGGER.info('Serving %s to %s (auth: %s)',
+                     request.path, request.remote_addr, authenticated)
+
         result = handler(request, **values)
 
         if isinstance(result, self.Response):
@@ -437,7 +524,7 @@ class HomeAssistantView(object):
                 mimetype = mimetypes.guess_type(fil)[0]
 
             try:
-                fil = open(fil)
+                fil = open(fil, mode='br')
             except IOError:
                 raise NotFound()
 

homeassistant/components/hvac/__init__.py

@@ -6,17 +6,18 @@ https://home-assistant.io/components/hvac/
 """
 import logging
 import os
+from numbers import Number
 
 from homeassistant.helpers.entity_component import EntityComponent
 
 from homeassistant.config import load_yaml_config_file
 import homeassistant.util as util
+from homeassistant.util.temperature import convert as convert_temperature
 from homeassistant.helpers.entity import Entity
-from homeassistant.helpers.temperature import convert
 from homeassistant.helpers.config_validation import PLATFORM_SCHEMA  # noqa
 from homeassistant.const import (
     ATTR_ENTITY_ID, ATTR_TEMPERATURE, STATE_ON, STATE_OFF, STATE_UNKNOWN,
-    TEMP_CELCIUS)
+    TEMP_CELSIUS)
 
 DOMAIN = "hvac"
 
@@ -204,8 +205,8 @@ def setup(hass, config):
             return
 
         for hvac in target_hvacs:
-            hvac.set_temperature(convert(
-                temperature, hass.config.temperature_unit,
+            hvac.set_temperature(convert_temperature(
+                temperature, hass.config.units.temperature_unit,
                 hvac.unit_of_measurement))
 
             if hvac.should_poll:
@@ -425,49 +426,49 @@ class HvacDevice(Entity):
 
     def set_temperature(self, temperature):
         """Set new target temperature."""
-        pass
+        raise NotImplementedError()
 
     def set_humidity(self, humidity):
         """Set new target humidity."""
-        pass
+        raise NotImplementedError()
 
     def set_fan_mode(self, fan):
         """Set new target fan mode."""
-        pass
+        raise NotImplementedError()
 
     def set_operation_mode(self, operation_mode):
         """Set new target operation mode."""
-        pass
+        raise NotImplementedError()
 
     def set_swing_mode(self, swing_mode):
         """Set new target swing operation."""
-        pass
+        raise NotImplementedError()
 
     def turn_away_mode_on(self):
         """Turn away mode on."""
-        pass
+        raise NotImplementedError()
 
     def turn_away_mode_off(self):
         """Turn away mode off."""
-        pass
+        raise NotImplementedError()
 
     def turn_aux_heat_on(self):
         """Turn auxillary heater on."""
-        pass
+        raise NotImplementedError()
 
     def turn_aux_heat_off(self):
         """Turn auxillary heater off."""
-        pass
+        raise NotImplementedError()
 
     @property
     def min_temp(self):
         """Return the minimum temperature."""
-        return convert(19, TEMP_CELCIUS, self.unit_of_measurement)
+        return convert_temperature(19, TEMP_CELSIUS, self.unit_of_measurement)
 
     @property
     def max_temp(self):
         """Return the maximum temperature."""
-        return convert(30, TEMP_CELCIUS, self.unit_of_measurement)
+        return convert_temperature(30, TEMP_CELSIUS, self.unit_of_measurement)
 
     @property
     def min_humidity(self):
@@ -481,13 +482,13 @@ class HvacDevice(Entity):
 
     def _convert_for_display(self, temp):
         """Convert temperature into preferred units for display purposes."""
-        if temp is None:
-            return None
+        if temp is None or not isinstance(temp, Number):
+            return temp
 
-        value = convert(temp, self.unit_of_measurement,
-                        self.hass.config.temperature_unit)
+        value = convert_temperature(temp, self.unit_of_measurement,
+                                    self.hass.config.units.temperature_unit)
 
-        if self.hass.config.temperature_unit is TEMP_CELCIUS:
+        if self.hass.config.units.temperature_unit is TEMP_CELSIUS:
             decimal_count = 1
         else:
             # Users of fahrenheit generally expect integer units.