Merge pull request #24047 from home-assistant/rc

0.93.2

.circleci/config.yml

@@ -0,0 +1,272 @@
+# Python CircleCI 2.0 configuration file
+#
+# Check https://circleci.com/docs/2.0/language-python/ for more details
+#
+version: 2.1
+
+executors:
+
+  python:
+    parameters:
+      tag:
+        type: string
+        default: latest
+    docker:
+      - image: circleci/python:<< parameters.tag >>
+      - image: circleci/buildpack-deps:stretch
+    working_directory: ~/repo
+
+commands:
+
+  docker-prereqs:
+    description: Set up docker prerequisite requirement
+    steps:
+      - run: sudo apt-get update && sudo apt-get install -y --no-install-recommends
+          libudev-dev libavformat-dev libavcodec-dev libavdevice-dev libavutil-dev
+          libswscale-dev libswresample-dev libavfilter-dev
+
+  install-requirements:
+    description: Set up venv and install requirements python packages with cache support
+    parameters:
+      python:
+        type: string
+        default: latest
+      all:
+        description: pip install -r requirements_all.txt
+        type: boolean
+        default: false
+      test:
+        description: pip install -r requirements_test.txt
+        type: boolean
+        default: false
+      test_all:
+        description: pip install -r requirements_test_all.txt
+        type: boolean
+        default: false
+    steps:
+      - restore_cache:
+          keys:
+            - v1-<< parameters.python >>-{{ checksum "homeassistant/package_constraints.txt" }}-<<# parameters.all >>{{ checksum "requirements_all.txt" }}<</ parameters.all>>-<<# parameters.test >>{{ checksum "requirements_test.txt" }}<</ parameters.test>>-<<# parameters.test_all >>{{ checksum "requirements_test_all.txt" }}<</ parameters.test_all>>
+      - run:
+          name: install dependencies
+          command: |
+            python3 -m venv venv
+            . venv/bin/activate
+            pip install -q -U pip
+            pip install -q -U setuptools
+            <<# parameters.all >>pip install -q --progress-bar off -r requirements_all.txt -c homeassistant/package_constraints.txt<</ parameters.all>>
+            <<# parameters.test >>pip install -q --progress-bar off -r requirements_test.txt -c homeassistant/package_constraints.txt<</ parameters.test>>
+            <<# parameters.test_all >>pip install -q --progress-bar off -r requirements_test_all.txt -c homeassistant/package_constraints.txt<</ parameters.test_all>>
+          no_output_timeout: 15m
+      - save_cache:
+          paths:
+            - ./venv
+          key: v1-<< parameters.python >>-{{ checksum "homeassistant/package_constraints.txt" }}-<<# parameters.all >>{{ checksum "requirements_all.txt" }}<</ parameters.all>>-<<# parameters.test >>{{ checksum "requirements_test.txt" }}<</ parameters.test>>-<<# parameters.test_all >>{{ checksum "requirements_test_all.txt" }}<</ parameters.test_all>>
+
+  install:
+    description: Install Home Assistant
+    steps:
+      - run:
+          name: install
+          command: |
+            . venv/bin/activate
+            pip install -q --progress-bar off -e .
+
+jobs:
+
+  static-check:
+    executor:
+      name: python
+      tag: 3.5.5-stretch
+
+    steps:
+      - checkout
+      - docker-prereqs
+      - install-requirements:
+          python: 3.5.5-stretch
+          test: true
+
+      - run:
+          name: run static check
+          command: |
+            . venv/bin/activate
+            flake8 homeassistant tests script
+
+      - run:
+          name: run static type check
+          command: |
+            . venv/bin/activate
+            TYPING_FILES=$(cat mypyrc)
+            mypy $TYPING_FILES
+
+      - install
+
+      - run:
+          name: validate manifests
+          command: |
+            . venv/bin/activate
+            python -m script.hassfest validate
+
+      - run:
+          name: run gen_requirements_all
+          command: |
+            . venv/bin/activate
+            python script/gen_requirements_all.py validate
+
+  pre-install-all-requirements:
+    executor:
+      name: python
+      tag: 3.5.5-stretch
+
+    steps:
+      - checkout
+      - docker-prereqs
+      - install-requirements:
+          python: 3.5.5-stretch
+          all: true
+          test: true
+
+  pylint:
+    executor:
+      name: python
+      tag: 3.5.5-stretch
+    parallelism: 2
+
+    steps:
+      - checkout
+      - docker-prereqs
+      - install-requirements:
+          python: 3.5.5-stretch
+          all: true
+          test: true
+      - install
+
+      - run:
+          name: run pylint
+          command: |
+            . venv/bin/activate
+            PYFILES=$(circleci tests glob "homeassistant/**/*.py" | circleci tests split)
+            pylint ${PYFILES}
+          no_output_timeout: 15m
+
+  pre-test:
+    parameters:
+      python:
+        type: string
+    executor:
+      name: python
+      tag: << parameters.python >>
+
+    steps:
+      - checkout
+      - docker-prereqs
+      - install-requirements:
+          python: << parameters.python >>
+          test_all: true
+
+  test:
+    parameters:
+      python:
+        type: string
+    executor:
+      name: python
+      tag: << parameters.python >>
+    parallelism: 2
+
+    steps:
+      - checkout
+      - docker-prereqs
+      - install-requirements:
+          python: << parameters.python >>
+          test_all: true
+      - install
+
+      - run:
+          name: run tests with code coverage
+          command: |
+            . venv/bin/activate
+            CC_SWITCH="--cov --cov-report="
+            TESTFILES=$(circleci tests glob "tests/**/test_*.py" | circleci tests split --split-by=timings)
+            pytest --timeout=9 --durations=10 --junitxml=test-reports/homeassistant/results.xml -qq -o junit_family=xunit2 -o junit_suite_name=homeassistant -o console_output_style=count -p no:sugar $CC_SWITCH -- ${TESTFILES}
+            script/check_dirty
+            codecov
+
+      - store_test_results:
+          path: test-reports
+
+      - store_artifacts:
+          path: htmlcov
+          destination: cov-reports
+
+      - store_artifacts:
+          path: test-reports
+          destination: test-reports
+
+  # This job use machine executor, e.g. classic CircleCI VM because we need both lokalise-cli and a Python runtime.
+  # Classic CircleCI included python 2.7.12 and python 3.5.2 managed by pyenv, the Python version may need change if
+  # CircleCI changed its VM in future.
+  upload-translations:
+    machine: true
+
+    steps:
+      - checkout
+
+      - run:
+          name: upload english translations
+          command: |
+            pyenv versions
+            pyenv global 3.5.2
+            docker pull lokalise/lokalise-cli@sha256:2198814ebddfda56ee041a4b427521757dd57f75415ea9693696a64c550cef21
+            script/translations_upload
+
+workflows:
+  version: 2
+  build:
+    jobs:
+      - static-check
+      - pre-install-all-requirements:
+          requires:
+            - static-check
+      - pylint:
+          requires:
+            - pre-install-all-requirements
+      - pre-test:
+          name: pre-test 3.5.5
+          requires:
+            - static-check
+          python: 3.5.5-stretch
+      - pre-test:
+          name: pre-test 3.6
+          requires:
+            - static-check
+          python: 3.6-stretch
+      - pre-test:
+          name: pre-test 3.7
+          requires:
+            - static-check
+          python: 3.7-stretch
+      - test:
+          name: test 3.5.5
+          requires:
+            - pre-test 3.5.5
+          python: 3.5.5-stretch
+      - test:
+          name: test 3.6
+          requires:
+            - pre-test 3.6
+          python: 3.6-stretch
+      - test:
+          name: test 3.7
+          requires:
+            - pre-test 3.7
+          python: 3.7-stretch
+      # CircleCI does not allow failure yet
+      # - test:
+      #     name: test 3.8
+      #     python: 3.8-rc-stretch
+      - upload-translations:
+          requires:
+            - static-check
+          filters:
+            branches:
+              only: dev

.codecov.yml

@@ -0,0 +1,16 @@
+codecov:
+  branch: dev
+coverage:
+  status:
+    project:
+      default:
+        target: 90
+        threshold: 0.09
+  notify:
+    # Notify codecov room in Discord. The webhook URL (encrypted below) ends in /slack which is why we configure a Slack notification.
+    slack:
+      default:
+        url: "secret:TgWDUM4Jw0w7wMJxuxNF/yhSOHglIo1fGwInJnRLEVPy2P2aLimkoK1mtKCowH5TFw+baUXVXT3eAqefbdvIuM8BjRR4aRji95C6CYyD0QHy4N8i7nn1SQkWDPpS8IthYTg07rUDF7s5guurkKv2RrgoCdnnqjAMSzHoExMOF7xUmblMdhBTWJgBpWEhASJy85w/xxjlsE1xoTkzeJu9Q67pTXtRcn+5kb5/vIzPSYg="
+comment:
+  require_changes: yes
+  branches: master

.github/ISSUE_TEMPLATE.md

@@ -1,6 +1,8 @@
 <!-- READ THIS FIRST:
 - If you need additional help with this template please refer to https://www.home-assistant.io/help/reporting_issues/
 - Make sure you are running the latest version of Home Assistant before reporting an issue: https://github.com/home-assistant/home-assistant/releases
+- Frontend issues should be submitted to the home-assistant-polymer repository: https://github.com/home-assistant/home-assistant-polymer/issues
+- iOS issues should be submitted to the home-assistant-iOS repository: https://github.com/home-assistant/home-assistant-iOS/issues
 - Do not report issues for components if you are using custom components: files in <config-dir>/custom_components
 - This is for bugs only. Feature and enhancement requests should go in our community forum: https://community.home-assistant.io/c/feature-requests
 - Provide as many details as possible. Paste logs, configuration sample and code into the backticks. Do not delete any text from this template!

.github/ISSUE_TEMPLATE/Bug_report.md

@@ -7,6 +7,8 @@ about: Create a report to help us improve
 <!-- READ THIS FIRST:
 - If you need additional help with this template please refer to https://www.home-assistant.io/help/reporting_issues/
 - Make sure you are running the latest version of Home Assistant before reporting an issue: https://github.com/home-assistant/home-assistant/releases
+- Frontend issues should be submitted to the home-assistant-polymer repository: https://github.com/home-assistant/home-assistant-polymer/issues
+- iOS issues should be submitted to the home-assistant-iOS repository: https://github.com/home-assistant/home-assistant-iOS/issues
 - Do not report issues for components if you are using custom components: files in <config-dir>/custom_components
 - This is for bugs only. Feature and enhancement requests should go in our community forum: https://community.home-assistant.io/c/feature-requests
 - Provide as many details as possible. Paste logs, configuration sample and code into the backticks. Do not delete any text from this template!

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,9 +1,13 @@
+## Breaking Change:
+
+<!-- What is breaking and why we have to break it. Remove this section only if it was NOT a breaking change. -->
+
 ## Description:
 
 
 **Related issue (if applicable):** fixes #<home-assistant issue number goes here>
 
-**Pull request in [home-assistant.io](https://github.com/home-assistant/home-assistant.io) with documentation (if applicable):** home-assistant/home-assistant.io#<home-assistant.io PR number goes here>
+**Pull request with documentation for [home-assistant.io](https://github.com/home-assistant/home-assistant.io) (if applicable):** home-assistant/home-assistant.io#<home-assistant.io PR number goes here>
 
 ## Example entry for `configuration.yaml` (if applicable):
 ```yaml
@@ -13,18 +17,19 @@
 ## Checklist:
   - [ ] The code change is tested and works locally.
   - [ ] Local tests pass with `tox`. **Your PR cannot be merged unless tests pass**
+  - [ ] There is no commented out code in this PR.
+  - [ ] I have followed the [development checklist][dev-checklist]
 
 If user exposed functionality or configuration variables are added/changed:
   - [ ] Documentation added/updated in [home-assistant.io](https://github.com/home-assistant/home-assistant.io)
 
 If the code communicates with devices, web services, or third-party tools:
-  - [ ] 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]).
-  - [ ] New or updated dependencies have been added to `requirements_all.txt` by running `script/gen_requirements_all.py`.
-  - [ ] New files were added to `.coveragerc`.
+  - [ ] [_The manifest file_][manifest-docs] has all fields filled out correctly. Update and include derived files by running `python3 -m script.hassfest`.
+  - [ ] New or updated dependencies have been added to `requirements_all.txt` by running `python3 -m script.gen_requirements_all`.
+  - [ ] Untested files have been added to `.coveragerc`.
 
 If the code does not interact with devices:
   - [ ] Tests have been added to verify that the new code works.
 
-[ex-requir]: https://github.com/home-assistant/home-assistant/blob/dev/homeassistant/components/keyboard.py#L14
-[ex-import]: https://github.com/home-assistant/home-assistant/blob/dev/homeassistant/components/keyboard.py#L54
+[dev-checklist]: https://developers.home-assistant.io/docs/en/development_checklist.html
+[manifest-docs]: https://developers.home-assistant.io/docs/en/creating_integration_manifest.html

.gitignore

@@ -1,4 +1,5 @@
 config/*
+config2/*
 
 tests/testing_config/deps
 tests/testing_config/home-assistant.log
@@ -55,6 +56,7 @@ pip-log.txt
 .tox
 nosetests.xml
 htmlcov/
+test-reports/
 
 # Translations
 *.mo
@@ -78,11 +80,12 @@ venv
 .venv
 Pipfile*
 share/*
+Scripts/
 
 # vimmy stuff
 *.swp
 *.swo
-
+tags
 ctags.tmp
 
 # vagrant stuff

.isort.cfg

@@ -1,2 +0,0 @@
-[settings]
-multi_line_output=4

.readthedocs.yml

@@ -0,0 +1,10 @@
+# .readthedocs.yml
+
+build:
+  image: latest
+
+python:
+  version: 3.6
+  setup_py_install: true
+
+requirements_file: requirements_docs.txt

.travis.yml

@@ -1,8 +1,18 @@
 sudo: false
+dist: xenial
 addons:
   apt:
+    sources:
+      - sourceline: "ppa:jonathonf/ffmpeg-4"
     packages:
       - libudev-dev
+      - libavformat-dev
+      - libavcodec-dev
+      - libavdevice-dev
+      - libavutil-dev
+      - libswscale-dev
+      - libswresample-dev
+      - libavfilter-dev
 matrix:
   fast_finish: true
   include:
@@ -13,36 +23,11 @@ matrix:
     - python: "3.5.3"
       env: TOXENV=typing
     - python: "3.5.3"
-      env: TOXENV=cov
-      after_success: coveralls
-    - python: "3.6"
-      env: TOXENV=py36
+      env: TOXENV=py35
     - python: "3.7"
       env: TOXENV=py37
-      dist: xenial
-    - python: "3.8-dev"
-      env: TOXENV=py38
-      dist: xenial
-      if: branch = dev AND type = push
-  allow_failures:
-    - python: "3.8-dev"
-      env: TOXENV=py38
-      dist: xenial
 
-cache:
-  directories:
-    - $HOME/.cache/pip
-install: pip install -U tox coveralls
+cache: pip
+install: pip install -U tox
 language: python
-script: travis_wait 30 tox --develop
-services:
-  - docker
-before_deploy:
-  - docker pull lokalise/lokalise-cli@sha256:2198814ebddfda56ee041a4b427521757dd57f75415ea9693696a64c550cef21
-deploy:
-  skip_cleanup: true
-  provider: script
-  script: script/travis_deploy
-  on:
-    branch: dev
-    condition: $TOXENV = lint
+script: travis_wait 40 tox --develop

CODEOWNERS

@@ -1,125 +1,279 @@
+# This file is generated by script/manifest/codeowners.py
 # People marked here will be automatically requested for a review
 # when the code that they own is touched.
 # https://github.com/blog/2392-introducing-code-owners
 
+# Home Assistant Core
 setup.py @home-assistant/core
 homeassistant/*.py @home-assistant/core
 homeassistant/helpers/* @home-assistant/core
 homeassistant/util/* @home-assistant/core
-homeassistant/components/api.py @home-assistant/core
-homeassistant/components/automation/* @home-assistant/core
-homeassistant/components/configurator.py @home-assistant/core
-homeassistant/components/group.py @home-assistant/core
-homeassistant/components/history.py @home-assistant/core
-homeassistant/components/http/* @home-assistant/core
-homeassistant/components/input_*.py @home-assistant/core
-homeassistant/components/introduction.py @home-assistant/core
-homeassistant/components/logger.py @home-assistant/core
-homeassistant/components/mqtt/* @home-assistant/core
-homeassistant/components/panel_custom.py @home-assistant/core
-homeassistant/components/panel_iframe.py @home-assistant/core
-homeassistant/components/persistent_notification.py @home-assistant/core
-homeassistant/components/scene/__init__.py @home-assistant/core
-homeassistant/components/scene/hass.py @home-assistant/core
-homeassistant/components/script.py @home-assistant/core
-homeassistant/components/shell_command.py @home-assistant/core
-homeassistant/components/sun.py @home-assistant/core
-homeassistant/components/updater.py @home-assistant/core
-homeassistant/components/weblink.py @home-assistant/core
-homeassistant/components/websocket_api.py @home-assistant/core
-homeassistant/components/zone.py @home-assistant/core
 
-# HomeAssistant developer Teams
+# Virtualization
 Dockerfile @home-assistant/docker
 virtualization/Docker/* @home-assistant/docker
 
-homeassistant/components/zwave/* @home-assistant/z-wave
-homeassistant/components/*/zwave.py @home-assistant/z-wave
-
-homeassistant/components/hassio.py @home-assistant/hassio
-
-# Individual components
-homeassistant/components/alarm_control_panel/egardia.py @jeroenterheerdt
-homeassistant/components/alarm_control_panel/manual_mqtt.py @colinodell
-homeassistant/components/binary_sensor/hikvision.py @mezz64
-homeassistant/components/bmw_connected_drive.py @ChristianKuehnel
-homeassistant/components/camera/yi.py @bachya
-homeassistant/components/climate/ephember.py @ttroy50
-homeassistant/components/climate/eq3btsmart.py @rytilahti
-homeassistant/components/climate/sensibo.py @andrey-git
-homeassistant/components/cover/group.py @cdce8p
-homeassistant/components/cover/template.py @PhracturedBlue
-homeassistant/components/device_tracker/automatic.py @armills
-homeassistant/components/device_tracker/tile.py @bachya
-homeassistant/components/history_graph.py @andrey-git
-homeassistant/components/light/lifx.py @amelchio
-homeassistant/components/light/lifx_legacy.py @amelchio
-homeassistant/components/light/tplink.py @rytilahti
-homeassistant/components/light/yeelight.py @rytilahti
-homeassistant/components/lock/nello.py @pschmitt
-homeassistant/components/lock/nuki.py @pschmitt
-homeassistant/components/media_player/emby.py @mezz64
-homeassistant/components/media_player/kodi.py @armills
-homeassistant/components/media_player/liveboxplaytv.py @pschmitt
-homeassistant/components/media_player/mediaroom.py @dgomes
-homeassistant/components/media_player/monoprice.py @etsinko
-homeassistant/components/media_player/sonos.py @amelchio
-homeassistant/components/media_player/xiaomi_tv.py @fattdev
-homeassistant/components/media_player/yamaha_musiccast.py @jalmeroth
-homeassistant/components/plant.py @ChristianKuehnel
-homeassistant/components/scene/lifx_cloud.py @amelchio
-homeassistant/components/sensor/airvisual.py @bachya
-homeassistant/components/sensor/filter.py @dgomes
-homeassistant/components/sensor/gearbest.py @HerrHofrat
-homeassistant/components/sensor/irish_rail_transport.py @ttroy50
-homeassistant/components/sensor/miflora.py @danielhiversen @ChristianKuehnel
-homeassistant/components/sensor/nsw_fuel_station.py @nickw444
-homeassistant/components/sensor/pollen.py @bachya
-homeassistant/components/sensor/qnap.py @colinodell
-homeassistant/components/sensor/sma.py @kellerza
-homeassistant/components/sensor/sql.py @dgomes
-homeassistant/components/sensor/sytadin.py @gautric
-homeassistant/components/sensor/tibber.py @danielhiversen
-homeassistant/components/sensor/upnp.py @dgomes
-homeassistant/components/sensor/waqi.py @andrey-git
-homeassistant/components/switch/tplink.py @rytilahti
-homeassistant/components/vacuum/roomba.py @pschmitt
-homeassistant/components/xiaomi_aqara.py @danielhiversen @syssi
-
-homeassistant/components/*/axis.py @kane610
-homeassistant/components/*/bmw_connected_drive.py @ChristianKuehnel
-homeassistant/components/*/broadlink.py @danielhiversen
-homeassistant/components/*/deconz.py @kane610
-homeassistant/components/ecovacs.py @OverloadUT
-homeassistant/components/*/ecovacs.py @OverloadUT
-homeassistant/components/eight_sleep.py @mezz64
-homeassistant/components/*/eight_sleep.py @mezz64
-homeassistant/components/hive.py @Rendili @KJonline
-homeassistant/components/*/hive.py @Rendili @KJonline
-homeassistant/components/homekit/* @cdce8p
-homeassistant/components/knx.py @Julius2342
-homeassistant/components/*/knx.py @Julius2342
-homeassistant/components/konnected.py @heythisisnate
-homeassistant/components/*/konnected.py @heythisisnate
-homeassistant/components/matrix.py @tinloaf
-homeassistant/components/*/matrix.py @tinloaf
-homeassistant/components/openuv.py @bachya
-homeassistant/components/*/openuv.py @bachya
-homeassistant/components/qwikswitch.py @kellerza
-homeassistant/components/*/qwikswitch.py @kellerza
-homeassistant/components/rainmachine/* @bachya
-homeassistant/components/*/rainmachine.py @bachya
-homeassistant/components/*/rfxtrx.py @danielhiversen
-homeassistant/components/tahoma.py @philklei
-homeassistant/components/*/tahoma.py @philklei
-homeassistant/components/tesla.py @zabuldon
-homeassistant/components/*/tesla.py @zabuldon
-homeassistant/components/tellduslive.py @molobrakos @fredrike
-homeassistant/components/*/tellduslive.py @molobrakos @fredrike
-homeassistant/components/*/tradfri.py @ggravlingen
-homeassistant/components/velux.py @Julius2342
-homeassistant/components/*/velux.py @Julius2342
-homeassistant/components/*/xiaomi_aqara.py @danielhiversen @syssi
-homeassistant/components/*/xiaomi_miio.py @rytilahti @syssi
-
+# Other code
 homeassistant/scripts/check_config.py @kellerza
+
+# Integrations
+homeassistant/components/airvisual/* @bachya
+homeassistant/components/alarm_control_panel/* @colinodell
+homeassistant/components/alpha_vantage/* @fabaff
+homeassistant/components/amazon_polly/* @robbiet480
+homeassistant/components/ambiclimate/* @danielhiversen
+homeassistant/components/ambient_station/* @bachya
+homeassistant/components/api/* @home-assistant/core
+homeassistant/components/arduino/* @fabaff
+homeassistant/components/arest/* @fabaff
+homeassistant/components/asuswrt/* @kennedyshead
+homeassistant/components/auth/* @home-assistant/core
+homeassistant/components/automatic/* @armills
+homeassistant/components/automation/* @home-assistant/core
+homeassistant/components/aws/* @awarecan @robbiet480
+homeassistant/components/axis/* @kane610
+homeassistant/components/bitcoin/* @fabaff
+homeassistant/components/bizkaibus/* @UgaitzEtxebarria
+homeassistant/components/blink/* @fronzbot
+homeassistant/components/bmw_connected_drive/* @ChristianKuehnel
+homeassistant/components/braviatv/* @robbiet480
+homeassistant/components/broadlink/* @danielhiversen
+homeassistant/components/brunt/* @eavanvalkenburg
+homeassistant/components/bt_smarthub/* @jxwolstenholme
+homeassistant/components/cisco_ios/* @fbradyirl
+homeassistant/components/cisco_mobility_express/* @fbradyirl
+homeassistant/components/cisco_webex_teams/* @fbradyirl
+homeassistant/components/ciscospark/* @fbradyirl
+homeassistant/components/cloud/* @home-assistant/core
+homeassistant/components/cloudflare/* @ludeeus
+homeassistant/components/config/* @home-assistant/core
+homeassistant/components/configurator/* @home-assistant/core
+homeassistant/components/conversation/* @home-assistant/core
+homeassistant/components/coolmaster/* @OnFreund
+homeassistant/components/counter/* @fabaff
+homeassistant/components/cover/* @home-assistant/core
+homeassistant/components/cpuspeed/* @fabaff
+homeassistant/components/cups/* @fabaff
+homeassistant/components/daikin/* @fredrike @rofrantz
+homeassistant/components/darksky/* @fabaff
+homeassistant/components/deconz/* @kane610
+homeassistant/components/demo/* @home-assistant/core
+homeassistant/components/digital_ocean/* @fabaff
+homeassistant/components/discogs/* @thibmaek
+homeassistant/components/doorbird/* @oblogic7
+homeassistant/components/dweet/* @fabaff
+homeassistant/components/ecovacs/* @OverloadUT
+homeassistant/components/edp_redy/* @abmantis
+homeassistant/components/egardia/* @jeroenterheerdt
+homeassistant/components/eight_sleep/* @mezz64
+homeassistant/components/emby/* @mezz64
+homeassistant/components/enigma2/* @fbradyirl
+homeassistant/components/enocean/* @bdurrer
+homeassistant/components/ephember/* @ttroy50
+homeassistant/components/epsonworkforce/* @ThaStealth
+homeassistant/components/eq3btsmart/* @rytilahti
+homeassistant/components/esphome/* @OttoWinter
+homeassistant/components/essent/* @TheLastProject
+homeassistant/components/evohome/* @zxdavb
+homeassistant/components/file/* @fabaff
+homeassistant/components/filter/* @dgomes
+homeassistant/components/fitbit/* @robbiet480
+homeassistant/components/fixer/* @fabaff
+homeassistant/components/flock/* @fabaff
+homeassistant/components/flunearyou/* @bachya
+homeassistant/components/foursquare/* @robbiet480
+homeassistant/components/freebox/* @snoof85
+homeassistant/components/frontend/* @home-assistant/core
+homeassistant/components/gearbest/* @HerrHofrat
+homeassistant/components/geniushub/* @zxdavb
+homeassistant/components/gitter/* @fabaff
+homeassistant/components/glances/* @fabaff
+homeassistant/components/gntp/* @robbiet480
+homeassistant/components/google_translate/* @awarecan
+homeassistant/components/google_travel_time/* @robbiet480
+homeassistant/components/googlehome/* @ludeeus
+homeassistant/components/gpsd/* @fabaff
+homeassistant/components/group/* @home-assistant/core
+homeassistant/components/gtfs/* @robbiet480
+homeassistant/components/harmony/* @ehendrix23
+homeassistant/components/hassio/* @home-assistant/hass-io
+homeassistant/components/heos/* @andrewsayre
+homeassistant/components/hikvision/* @mezz64
+homeassistant/components/hikvisioncam/* @fbradyirl
+homeassistant/components/history/* @home-assistant/core
+homeassistant/components/history_graph/* @andrey-git
+homeassistant/components/hive/* @Rendili @KJonline
+homeassistant/components/homeassistant/* @home-assistant/core
+homeassistant/components/homekit/* @cdce8p
+homeassistant/components/homekit_controller/* @Jc2k
+homeassistant/components/homematic/* @pvizeli @danielperna84
+homeassistant/components/html5/* @robbiet480
+homeassistant/components/http/* @home-assistant/core
+homeassistant/components/huawei_lte/* @scop
+homeassistant/components/huawei_router/* @abmantis
+homeassistant/components/hue/* @balloob
+homeassistant/components/ign_sismologia/* @exxamalte
+homeassistant/components/incomfort/* @zxdavb
+homeassistant/components/influxdb/* @fabaff
+homeassistant/components/input_boolean/* @home-assistant/core
+homeassistant/components/input_datetime/* @home-assistant/core
+homeassistant/components/input_number/* @home-assistant/core
+homeassistant/components/input_select/* @home-assistant/core
+homeassistant/components/input_text/* @home-assistant/core
+homeassistant/components/integration/* @dgomes
+homeassistant/components/ios/* @robbiet480
+homeassistant/components/ipma/* @dgomes
+homeassistant/components/iqvia/* @bachya
+homeassistant/components/irish_rail_transport/* @ttroy50
+homeassistant/components/jewish_calendar/* @tsvi
+homeassistant/components/knx/* @Julius2342
+homeassistant/components/kodi/* @armills
+homeassistant/components/konnected/* @heythisisnate
+homeassistant/components/lametric/* @robbiet480
+homeassistant/components/launch_library/* @ludeeus
+homeassistant/components/lifx/* @amelchio
+homeassistant/components/lifx_cloud/* @amelchio
+homeassistant/components/lifx_legacy/* @amelchio
+homeassistant/components/linux_battery/* @fabaff
+homeassistant/components/liveboxplaytv/* @pschmitt
+homeassistant/components/logger/* @home-assistant/core
+homeassistant/components/logi_circle/* @evanjd
+homeassistant/components/lovelace/* @home-assistant/core
+homeassistant/components/luci/* @fbradyirl
+homeassistant/components/luftdaten/* @fabaff
+homeassistant/components/mastodon/* @fabaff
+homeassistant/components/matrix/* @tinloaf
+homeassistant/components/mediaroom/* @dgomes
+homeassistant/components/melissa/* @kennedyshead
+homeassistant/components/met/* @danielhiversen
+homeassistant/components/meteoalarm/* @rolfberkenbosch
+homeassistant/components/miflora/* @danielhiversen @ChristianKuehnel
+homeassistant/components/mill/* @danielhiversen
+homeassistant/components/min_max/* @fabaff
+homeassistant/components/mobile_app/* @robbiet480
+homeassistant/components/monoprice/* @etsinko
+homeassistant/components/moon/* @fabaff
+homeassistant/components/mpd/* @fabaff
+homeassistant/components/mqtt/* @home-assistant/core
+homeassistant/components/mystrom/* @fabaff
+homeassistant/components/nello/* @pschmitt
+homeassistant/components/ness_alarm/* @nickw444
+homeassistant/components/nest/* @awarecan
+homeassistant/components/netdata/* @fabaff
+homeassistant/components/nextbus/* @vividboarder
+homeassistant/components/nissan_leaf/* @filcole
+homeassistant/components/nmbs/* @thibmaek
+homeassistant/components/no_ip/* @fabaff
+homeassistant/components/notify/* @home-assistant/core
+homeassistant/components/nsw_fuel_station/* @nickw444
+homeassistant/components/nuki/* @pschmitt
+homeassistant/components/ohmconnect/* @robbiet480
+homeassistant/components/onboarding/* @home-assistant/core
+homeassistant/components/openuv/* @bachya
+homeassistant/components/openweathermap/* @fabaff
+homeassistant/components/orangepi_gpio/* @pascallj
+homeassistant/components/owlet/* @oblogic7
+homeassistant/components/panel_custom/* @home-assistant/core
+homeassistant/components/panel_iframe/* @home-assistant/core
+homeassistant/components/persistent_notification/* @home-assistant/core
+homeassistant/components/philips_js/* @elupus
+homeassistant/components/pi_hole/* @fabaff
+homeassistant/components/plant/* @ChristianKuehnel
+homeassistant/components/point/* @fredrike
+homeassistant/components/ps4/* @ktnrg45
+homeassistant/components/ptvsd/* @swamp-ig
+homeassistant/components/push/* @dgomes
+homeassistant/components/pvoutput/* @fabaff
+homeassistant/components/qnap/* @colinodell
+homeassistant/components/quantum_gateway/* @cisasteelersfan
+homeassistant/components/qwikswitch/* @kellerza
+homeassistant/components/raincloud/* @vanstinator
+homeassistant/components/rainmachine/* @bachya
+homeassistant/components/random/* @fabaff
+homeassistant/components/rfxtrx/* @danielhiversen
+homeassistant/components/rmvtransport/* @cgtobi
+homeassistant/components/roomba/* @pschmitt
+homeassistant/components/ruter/* @ludeeus
+homeassistant/components/scene/* @home-assistant/core
+homeassistant/components/scrape/* @fabaff
+homeassistant/components/script/* @home-assistant/core
+homeassistant/components/sensibo/* @andrey-git
+homeassistant/components/serial/* @fabaff
+homeassistant/components/seventeentrack/* @bachya
+homeassistant/components/shell_command/* @home-assistant/core
+homeassistant/components/shiftr/* @fabaff
+homeassistant/components/shodan/* @fabaff
+homeassistant/components/simplisafe/* @bachya
+homeassistant/components/sma/* @kellerza
+homeassistant/components/smartthings/* @andrewsayre
+homeassistant/components/smtp/* @fabaff
+homeassistant/components/sonos/* @amelchio
+homeassistant/components/spaceapi/* @fabaff
+homeassistant/components/spider/* @peternijssen
+homeassistant/components/sql/* @dgomes
+homeassistant/components/statistics/* @fabaff
+homeassistant/components/stiebel_eltron/* @fucm
+homeassistant/components/sun/* @home-assistant/core
+homeassistant/components/supla/* @mwegrzynek
+homeassistant/components/swiss_hydrological_data/* @fabaff
+homeassistant/components/swiss_public_transport/* @fabaff
+homeassistant/components/switchbot/* @danielhiversen
+homeassistant/components/switcher_kis/* @tomerfi
+homeassistant/components/switchmate/* @danielhiversen
+homeassistant/components/syncthru/* @nielstron
+homeassistant/components/synology_srm/* @aerialls
+homeassistant/components/syslog/* @fabaff
+homeassistant/components/sytadin/* @gautric
+homeassistant/components/tahoma/* @philklei
+homeassistant/components/tautulli/* @ludeeus
+homeassistant/components/tellduslive/* @fredrike
+homeassistant/components/template/* @PhracturedBlue
+homeassistant/components/tesla/* @zabuldon
+homeassistant/components/tfiac/* @fredrike @mellado
+homeassistant/components/thethingsnetwork/* @fabaff
+homeassistant/components/threshold/* @fabaff
+homeassistant/components/tibber/* @danielhiversen
+homeassistant/components/tile/* @bachya
+homeassistant/components/time_date/* @fabaff
+homeassistant/components/toon/* @frenck
+homeassistant/components/tplink/* @rytilahti
+homeassistant/components/traccar/* @ludeeus
+homeassistant/components/tradfri/* @ggravlingen
+homeassistant/components/tts/* @robbiet480
+homeassistant/components/twilio_call/* @robbiet480
+homeassistant/components/twilio_sms/* @robbiet480
+homeassistant/components/uber/* @robbiet480
+homeassistant/components/unifi/* @kane610
+homeassistant/components/upcloud/* @scop
+homeassistant/components/updater/* @home-assistant/core
+homeassistant/components/upnp/* @robbiet480
+homeassistant/components/uptimerobot/* @ludeeus
+homeassistant/components/utility_meter/* @dgomes
+homeassistant/components/velux/* @Julius2342
+homeassistant/components/version/* @fabaff
+homeassistant/components/vizio/* @raman325
+homeassistant/components/waqi/* @andrey-git
+homeassistant/components/weather/* @fabaff
+homeassistant/components/weblink/* @home-assistant/core
+homeassistant/components/websocket_api/* @home-assistant/core
+homeassistant/components/wemo/* @sqldiablo
+homeassistant/components/worldclock/* @fabaff
+homeassistant/components/xfinity/* @cisasteelersfan
+homeassistant/components/xiaomi_aqara/* @danielhiversen @syssi
+homeassistant/components/xiaomi_miio/* @rytilahti @syssi
+homeassistant/components/xiaomi_tv/* @fattdev
+homeassistant/components/xmpp/* @fabaff @flowolf
+homeassistant/components/yamaha_musiccast/* @jalmeroth
+homeassistant/components/yeelight/* @rytilahti @zewelor
+homeassistant/components/yeelightsunflower/* @lindsaymarkward
+homeassistant/components/yessssms/* @flowolf
+homeassistant/components/yi/* @bachya
+homeassistant/components/zeroconf/* @robbiet480
+homeassistant/components/zha/* @dmulcahey @adminiuga
+homeassistant/components/zone/* @home-assistant/core
+homeassistant/components/zoneminder/* @rohankapoorcom
+homeassistant/components/zwave/* @home-assistant/z-wave
+
+# Individual files
+homeassistant/components/group/cover @cdce8p
+homeassistant/components/demo/weather @fabaff

CONTRIBUTING.md

@@ -10,5 +10,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 take a peek at the [developer documentation](https://home-assistant.io/developers/) to get more details.
+Still interested? Then you should take a peek at the [developer documentation](https://developers.home-assistant.io/) to get more details.
 

Dockerfile

@@ -2,7 +2,7 @@
 # When updating this file, please also update virtualization/Docker/Dockerfile.dev
 # This way, the development image and the production image are kept in sync.
 
-FROM python:3.6
+FROM python:3.7
 LABEL maintainer="Paulus Schoutsen <Paulus@PaulusSchoutsen.nl>"
 
 # Uncomment any of the following lines to disable the installation.
@@ -11,11 +11,11 @@ LABEL maintainer="Paulus Schoutsen <Paulus@PaulusSchoutsen.nl>"
 #ENV INSTALL_FFMPEG no
 #ENV INSTALL_LIBCEC no
 #ENV INSTALL_SSOCR no
+#ENV INSTALL_DLIB no
 #ENV INSTALL_IPERF3 no
 
 VOLUME /config
 
-RUN mkdir -p /usr/src/app
 WORKDIR /usr/src/app
 
 # Copy build scripts
@@ -27,7 +27,7 @@ COPY requirements_all.txt requirements_all.txt
 # Uninstall enum34 because some dependencies install it but breaks Python 3.4+.
 # See PR #8103 for more info.
 RUN pip3 install --no-cache-dir -r requirements_all.txt && \
-    pip3 install --no-cache-dir mysqlclient psycopg2 uvloop cchardet cython
+    pip3 install --no-cache-dir mysqlclient psycopg2 uvloop==0.12.2 cchardet cython tensorflow
 
 # Copy source
 COPY . .

README.rst

@@ -1,4 +1,4 @@
-Home Assistant |Build Status| |Coverage Status| |Chat Status| |Reviewed by Hound|
+Home Assistant |Build Status| |CI Status| |Coverage Status| |Chat Status|
 =================================================================================
 
 Home Assistant is a home automation platform running on Python 3. It is able to track and control all devices at home and offer a platform for automating control.
@@ -21,20 +21,20 @@ Featured integrations
 
 |screenshot-components|
 
-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
-components <https://home-assistant.io/developers/creating_components/>`__.
+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://developers.home-assistant.io/docs/en/architecture_index.html>`__ and the `section on creating your own
+components <https://developers.home-assistant.io/docs/en/creating_component_index.html>`__.
 
 If you run into issues while using Home Assistant or during development
 of a component, check the `Home Assistant help section <https://home-assistant.io/help/>`__ of our website for further help and information.
 
-.. |Build Status| image:: https://travis-ci.org/home-assistant/home-assistant.svg?branch=master
+.. |Build Status| image:: https://travis-ci.org/home-assistant/home-assistant.svg?branch=dev
    :target: https://travis-ci.org/home-assistant/home-assistant
+.. |CI Status| image:: https://circleci.com/gh/home-assistant/home-assistant.svg?style=shield
+   :target: https://circleci.com/gh/home-assistant/home-assistant
 .. |Coverage Status| image:: https://img.shields.io/coveralls/home-assistant/home-assistant.svg
    :target: https://coveralls.io/r/home-assistant/home-assistant?branch=master
 .. |Chat Status| image:: https://img.shields.io/discord/330944238910963714.svg
    :target: https://discord.gg/c5DvZ4e
-.. |Reviewed by Hound| image:: https://img.shields.io/badge/Reviewed_by-Hound-8E64B0.svg
-   :target: https://houndci.com
 .. |screenshot-states| image:: https://raw.github.com/home-assistant/home-assistant/master/docs/screenshots.png
    :target: https://home-assistant.io/demo/
 .. |screenshot-components| image:: https://raw.github.com/home-assistant/home-assistant/dev/docs/screenshot-components.png

azure-pipelines.yml

@@ -0,0 +1,186 @@
+# https://dev.azure.com/home-assistant
+
+trigger:
+  batch: true
+  branches:
+    include:
+    - dev
+  tags:
+    include:
+    - '*'
+
+variables:
+  - name: versionBuilder
+    value: '3.2'
+  - name: versionWheels
+    value: '0.3'
+  - group: docker
+  - group: wheels
+  - group: github
+
+jobs:
+
+- job: 'Wheels'
+  condition: eq(variables['Build.SourceBranchName'], 'dev')
+  timeoutInMinutes: 360
+  pool:
+    vmImage: 'ubuntu-16.04'
+  strategy:
+    maxParallel: 3
+    matrix:
+      amd64:
+        buildArch: 'amd64'
+      i386:
+        buildArch: 'i386'
+      armhf:
+        buildArch: 'armhf'
+      armv7:
+        buildArch: 'armv7'
+      aarch64:
+        buildArch: 'aarch64'
+  steps:
+  - script: |
+      sudo apt-get install -y --no-install-recommends \
+        qemu-user-static \
+        binfmt-support
+      
+      sudo mount binfmt_misc -t binfmt_misc /proc/sys/fs/binfmt_misc
+      sudo update-binfmts --enable qemu-arm
+      sudo update-binfmts --enable qemu-aarch64
+    displayName: 'Initial cross build'
+  - script: |
+      mkdir -p .ssh
+      echo -e "-----BEGIN RSA PRIVATE KEY-----\n$(wheelsSSH)\n-----END RSA PRIVATE KEY-----" >> .ssh/id_rsa
+      ssh-keyscan -H $(wheelsHost) >> .ssh/known_hosts
+      chmod 600 .ssh/*
+    displayName: 'Install ssh key'
+  - script: sudo docker pull homeassistant/$(buildArch)-wheels:$(versionWheels)
+    displayName: 'Install wheels builder'
+  - script: |
+      cp requirements_all.txt requirements_hassio.txt
+
+      # Enable because we can build it
+      sed -i "s|# pytradfri|pytradfri|g" requirements_hassio.txt
+      sed -i "s|# pybluez|pybluez|g" requirements_hassio.txt
+      sed -i "s|# bluepy|bluepy|g" requirements_hassio.txt
+      sed -i "s|# beacontools|beacontools|g" requirements_hassio.txt
+      sed -i "s|# RPi.GPIO|RPi.GPIO|g" requirements_hassio.txt
+      sed -i "s|# raspihats|raspihats|g" requirements_hassio.txt
+      sed -i "s|# rpi-rf|rpi-rf|g" requirements_hassio.txt
+      sed -i "s|# blinkt|blinkt|g" requirements_hassio.txt
+      sed -i "s|# fritzconnection|fritzconnection|g" requirements_hassio.txt
+      sed -i "s|# pyuserinput|pyuserinput|g" requirements_hassio.txt
+      sed -i "s|# evdev|evdev|g" requirements_hassio.txt
+      sed -i "s|# smbus-cffi|smbus-cffi|g" requirements_hassio.txt
+      sed -i "s|# i2csense|i2csense|g" requirements_hassio.txt
+      sed -i "s|# python-eq3bt|python-eq3bt|g" requirements_hassio.txt
+      sed -i "s|# pycups|pycups|g" requirements_hassio.txt
+      sed -i "s|# homekit|homekit|g" requirements_hassio.txt
+      sed -i "s|# decora_wifi|decora_wifi|g" requirements_hassio.txt
+      sed -i "s|# decora|decora|g" requirements_hassio.txt
+      sed -i "s|# PySwitchbot|PySwitchbot|g" requirements_hassio.txt
+      sed -i "s|# pySwitchmate|pySwitchmate|g" requirements_hassio.txt
+
+      # Disable because of error
+      sed -i "s|insteonplm|# insteonplm|g" requirements_hassio.txt
+    displayName: 'Prepare requirements files for Hass.io'
+  - script: |
+      sudo docker run --rm -v $(pwd):/data:ro -v $(pwd)/.ssh:/root/.ssh:rw \
+        homeassistant/$(buildArch)-wheels:$(versionWheels) \
+        --apk "build-base;cmake;git;linux-headers;bluez-dev;libffi-dev;openssl-dev;glib-dev;eudev-dev;libxml2-dev;libxslt-dev;libpng-dev;libjpeg-turbo-dev;tiff-dev;autoconf;automake;cups-dev;linux-headers;gmp-dev;mpfr-dev;mpc1-dev;ffmpeg-dev" \
+        --index https://wheels.hass.io \
+        --requirement requirements_hassio.txt \
+        --upload rsync \
+        --remote wheels@$(wheelsHost):/opt/wheels
+    displayName: 'Run wheels build'
+
+
+- job: 'Release'
+  condition: startsWith(variables['Build.SourceBranch'], 'refs/tags')
+  timeoutInMinutes: 120
+  pool:
+    vmImage: 'ubuntu-16.04'
+  strategy:
+    maxParallel: 5
+    matrix:
+      amd64:
+        buildArch: 'amd64'
+        buildMachine: 'qemux86-64,intel-nuc'
+      i386:
+        buildArch: 'i386'
+        buildMachine: 'qemux86'
+      armhf:
+        buildArch: 'armhf'
+        buildMachine: 'qemuarm,raspberrypi'
+      armv7:
+        buildArch: 'armv7'
+        buildMachine: 'raspberrypi2,raspberrypi3,odroid-xu,tinker'
+      aarch64:
+        buildArch: 'aarch64'
+        buildMachine: 'qemuarm-64,raspberrypi3-64,odroid-c2,orangepi-prime'
+  steps:
+  - script: sudo docker login -u $(dockerUser) -p $(dockerPassword)
+    displayName: 'Docker hub login'
+  - script: sudo docker pull homeassistant/amd64-builder:$(versionBuilder)
+    displayName: 'Install Builder'
+  - script: |
+      set -e
+
+      sudo docker run --rm --privileged \
+        -v ~/.docker:/root/.docker \
+        -v /run/docker.sock:/run/docker.sock:rw \
+        homeassistant/amd64-builder:$(versionBuilder) \
+        --homeassistant $(Build.SourceBranchName) "--$(buildArch)" \
+        -r https://github.com/home-assistant/hassio-homeassistant \
+        -t generic --docker-hub homeassistant
+
+      sudo docker run --rm --privileged \
+        -v ~/.docker:/root/.docker \
+        -v /run/docker.sock:/run/docker.sock:rw \
+        homeassistant/amd64-builder:$(versionBuilder) \
+        --homeassistant-machine "$(Build.SourceBranchName)=$(buildMachine)" \
+        -r https://github.com/home-assistant/hassio-homeassistant \
+        -t machine --docker-hub homeassistant
+    displayName: 'Build Release'
+
+
+- job: 'ReleasePublish'
+  condition: and(startsWith(variables['Build.SourceBranch'], 'refs/tags'), succeeded('Release'))
+  dependsOn:
+    - 'Release'
+  pool:
+    vmImage: 'ubuntu-16.04'
+  steps:
+  - script: |
+      sudo apt-get install -y --no-install-recommends \
+        git jq
+
+      git config --global user.name "Pascal Vizeli"
+      git config --global user.email "pvizeli@syshack.ch"
+      git config --global credential.helper store
+
+      echo "https://$(githubToken):x-oauth-basic@github.com" > $HOME/.git-credentials
+    displayName: 'Install requirements'
+  - script: |
+      set -e
+
+      version="$(Build.SourceBranchName)"
+
+      git clone https://github.com/home-assistant/hassio-version
+      cd hassio-version
+
+      dev_version="$(jq --raw-output '.homeassistant.default' dev.json)"
+      beta_version="$(jq --raw-output '.homeassistant.default' beta.json)"
+      stable_version="$(jq --raw-output '.homeassistant.default' stable.json)"
+
+      if [[ "$version" =~ b ]]; then
+        sed -i "s|$dev_version|$version|g" dev.json
+        sed -i "s|$beta_version|$version|g" beta.json
+      else
+        sed -i "s|$dev_version|$version|g" dev.json
+        sed -i "s|$beta_version|$version|g" beta.json
+        sed -i "s|$stable_version|$version|g" stable.json
+      fi
+
+      git commit -am "Bump Home Assistant $version"
+      git push

docs/source/api/helpers.rst

@@ -4,6 +4,23 @@ homeassistant.helpers package
 Submodules
 ----------
 
+homeassistant.helpers.aiohttp_client module
+-------------------------------------------
+
+.. automodule:: homeassistant.helpers.aiohttp_client
+    :members:
+    :undoc-members:
+    :show-inheritance:
+
+
+homeassistant.helpers.area_registry module
+------------------------------------------
+
+.. automodule:: homeassistant.helpers.area_registry
+    :members:
+    :undoc-members:
+    :show-inheritance:
+
 homeassistant.helpers.condition module
 --------------------------------------
 
@@ -12,6 +29,14 @@ homeassistant.helpers.condition module
     :undoc-members:
     :show-inheritance:
 
+homeassistant.helpers.config_entry_flow module
+----------------------------------------------
+
+.. automodule:: homeassistant.helpers.config_entry_flow
+    :members:
+    :undoc-members:
+    :show-inheritance:
+
 homeassistant.helpers.config_validation module
 ----------------------------------------------
 
@@ -20,6 +45,30 @@ homeassistant.helpers.config_validation module
     :undoc-members:
     :show-inheritance:
 
+homeassistant.helpers.data_entry_flow module
+--------------------------------------------
+
+.. automodule:: homeassistant.helpers.data_entry_flow
+    :members:
+    :undoc-members:
+    :show-inheritance:
+
+homeassistant.helpers.deprecation module
+----------------------------------------
+
+.. automodule:: homeassistant.helpers.depracation
+    :members:
+    :undoc-members:
+    :show-inheritance:
+
+homeassistant.helpers.device_registry module
+--------------------------------------------
+
+.. automodule:: homeassistant.helpers.device_registry
+    :members:
+    :undoc-members:
+    :show-inheritance:
+
 homeassistant.helpers.discovery module
 --------------------------------------
 
@@ -28,6 +77,14 @@ homeassistant.helpers.discovery module
     :undoc-members:
     :show-inheritance:
 
+homeassistant.helpers.dispatcher module
+---------------------------------------
+
+.. automodule:: homeassistant.helpers.dispatcher
+    :members:
+    :undoc-members:
+    :show-inheritance:
+
 homeassistant.helpers.entity module
 -----------------------------------
 
@@ -44,6 +101,38 @@ homeassistant.helpers.entity_component module
     :undoc-members:
     :show-inheritance:
 
+homeassistant.helpers.entity_platform module
+--------------------------------------------
+
+.. automodule:: homeassistant.helpers.entity_platform
+    :members:
+    :undoc-members:
+    :show-inheritance:
+
+homeassistant.helpers.entity_registry module
+--------------------------------------------
+
+.. automodule:: homeassistant.helpers.entity_registry
+    :members:
+    :undoc-members:
+    :show-inheritance:
+
+homeassistant.helpers.entity_values module
+------------------------------------------
+
+.. automodule:: homeassistant.helpers.entity_values
+    :members:
+    :undoc-members:
+    :show-inheritance:
+
+homeassistant.helpers.entityfilter module
+-----------------------------------------
+
+.. automodule:: homeassistant.helpers.entityfilter
+    :members:
+    :undoc-members:
+    :show-inheritance:
+
 homeassistant.helpers.event module
 ----------------------------------
 
@@ -52,10 +141,26 @@ homeassistant.helpers.event module
     :undoc-members:
     :show-inheritance:
 
-homeassistant.helpers.event_decorators module
----------------------------------------------
+homeassistant.helpers.icon module
+---------------------------------
 
-.. automodule:: homeassistant.helpers.event_decorators
+.. automodule:: homeassistant.helpers.icon
+    :members:
+    :undoc-members:
+    :show-inheritance:
+
+homeassistant.helpers.intent module
+-----------------------------------
+
+.. automodule:: homeassistant.helpers.intent
+    :members:
+    :undoc-members:
+    :show-inheritance:
+
+homeassistant.helpers.json module
+---------------------------------
+
+.. automodule:: homeassistant.helpers.json
     :members:
     :undoc-members:
     :show-inheritance:
@@ -68,6 +173,22 @@ homeassistant.helpers.location module
     :undoc-members:
     :show-inheritance:
 
+homeassistant.helpers.logging module
+------------------------------------
+
+.. automodule:: homeassistant.helpers.logging
+    :members:
+    :undoc-members:
+    :show-inheritance:
+
+homeassistant.helpers.restore_state module
+------------------------------------------
+
+.. automodule:: homeassistant.helpers.restore_state
+    :members:
+    :undoc-members:
+    :show-inheritance:
+
 homeassistant.helpers.script module
 -----------------------------------
 
@@ -84,6 +205,14 @@ homeassistant.helpers.service module
     :undoc-members:
     :show-inheritance:
 
+homeassistant.helpers.signal module
+-----------------------------------
+
+.. automodule:: homeassistant.helpers.signal
+    :members:
+    :undoc-members:
+    :show-inheritance:
+
 homeassistant.helpers.state module
 ----------------------------------
 
@@ -92,6 +221,38 @@ homeassistant.helpers.state module
     :undoc-members:
     :show-inheritance:
 
+homeassistant.helpers.storage module
+------------------------------------
+
+.. automodule:: homeassistant.helpers.storage
+    :members:
+    :undoc-members:
+    :show-inheritance:
+
+homeassistant.helpers.sun module
+--------------------------------
+
+.. automodule:: homeassistant.helpers.sun
+    :members:
+    :undoc-members:
+    :show-inheritance:
+
+homeassistant.helpers.system_info module
+----------------------------------------
+
+.. automodule:: homeassistant.helpers.system_info
+    :members:
+    :undoc-members:
+    :show-inheritance:
+
+homeassistant.helpers.temperature module
+----------------------------------------
+
+.. automodule:: homeassistant.helpers.temperature
+    :members:
+    :undoc-members:
+    :show-inheritance:
+
 homeassistant.helpers.template module
 -------------------------------------
 
@@ -100,6 +261,14 @@ homeassistant.helpers.template module
     :undoc-members:
     :show-inheritance:
 
+homeassistant.helpers.translation module
+-----------------------------------------
+
+.. automodule:: homeassistant.helpers.translation
+    :members:
+    :undoc-members:
+    :show-inheritance:
+
 homeassistant.helpers.typing module
 -----------------------------------
 

docs/source/index.rst

@@ -19,4 +19,4 @@ Indices and tables
 * :ref:`modindex`
 * :ref:`search`
 
-.. _Home Assistant developers: https://home-assistant.io/developers/
+.. _Home Assistant developers: https://developers.home-assistant.io/

homeassistant/__main__.py

@@ -7,9 +7,9 @@ import platform
 import subprocess
 import sys
 import threading
-
-from typing import List, Dict, Any  # noqa pylint: disable=unused-import
-
+from typing import (  # noqa pylint: disable=unused-import
+    List, Dict, Any, TYPE_CHECKING
+)
 
 from homeassistant import monkey_patch
 from homeassistant.const import (
@@ -19,16 +19,38 @@ from homeassistant.const import (
     RESTART_EXIT_CODE,
 )
 
+if TYPE_CHECKING:
+    from homeassistant import core
 
-def attempt_use_uvloop() -> None:
+
+def set_loop() -> None:
     """Attempt to use uvloop."""
     import asyncio
+    from asyncio.events import BaseDefaultEventLoopPolicy
 
-    try:
-        import uvloop
-        asyncio.set_event_loop_policy(uvloop.EventLoopPolicy())
-    except ImportError:
-        pass
+    policy = None
+
+    if sys.platform == 'win32':
+        if hasattr(asyncio, 'WindowsProactorEventLoopPolicy'):
+            # pylint: disable=no-member
+            policy = asyncio.WindowsProactorEventLoopPolicy()
+        else:
+            class ProactorPolicy(BaseDefaultEventLoopPolicy):
+                """Event loop policy to create proactor loops."""
+
+                _loop_factory = asyncio.ProactorEventLoop
+
+            policy = ProactorPolicy()
+    else:
+        try:
+            import uvloop
+        except ImportError:
+            pass
+        else:
+            policy = uvloop.EventLoopPolicy()
+
+    if policy is not None:
+        asyncio.set_event_loop_policy(policy)
 
 
 def validate_python() -> None:
@@ -68,10 +90,12 @@ def ensure_config_path(config_dir: str) -> None:
             sys.exit(1)
 
 
-def ensure_config_file(config_dir: str) -> str:
+async def ensure_config_file(hass: 'core.HomeAssistant', config_dir: str) \
+        -> str:
     """Ensure configuration file exists."""
     import homeassistant.config as config_util
-    config_path = config_util.ensure_config_exists(config_dir)
+    config_path = await config_util.async_ensure_config_exists(
+        hass, config_dir)
 
     if config_path is None:
         print('Error getting configuration path')
@@ -240,51 +264,40 @@ def cmdline() -> List[str]:
     return [arg for arg in sys.argv if arg != '--daemon']
 
 
-def setup_and_run_hass(config_dir: str,
-                       args: argparse.Namespace) -> int:
+async def setup_and_run_hass(config_dir: str,
+                             args: argparse.Namespace) -> int:
     """Set up HASS and run."""
-    from homeassistant import bootstrap
+    # pylint: disable=redefined-outer-name
+    from homeassistant import bootstrap, core
 
-    # Run a simple daemon runner process on Windows to handle restarts
-    if os.name == 'nt' and '--runner' not in sys.argv:
-        nt_args = cmdline() + ['--runner']
-        while True:
-            try:
-                subprocess.check_call(nt_args)
-                sys.exit(0)
-            except subprocess.CalledProcessError as exc:
-                if exc.returncode != RESTART_EXIT_CODE:
-                    sys.exit(exc.returncode)
+    hass = core.HomeAssistant()
 
     if args.demo_mode:
         config = {
             'frontend': {},
             'demo': {}
         }  # type: Dict[str, Any]
-        hass = bootstrap.from_config_dict(
-            config, config_dir=config_dir, verbose=args.verbose,
+        bootstrap.async_from_config_dict(
+            config, hass, config_dir=config_dir, verbose=args.verbose,
             skip_pip=args.skip_pip, log_rotate_days=args.log_rotate_days,
             log_file=args.log_file, log_no_color=args.log_no_color)
     else:
-        config_file = ensure_config_file(config_dir)
+        config_file = await ensure_config_file(hass, config_dir)
         print('Config directory:', config_dir)
-        hass = bootstrap.from_config_file(
-            config_file, verbose=args.verbose, skip_pip=args.skip_pip,
+        await bootstrap.async_from_config_file(
+            config_file, hass, verbose=args.verbose, skip_pip=args.skip_pip,
             log_rotate_days=args.log_rotate_days, log_file=args.log_file,
             log_no_color=args.log_no_color)
 
-    if hass is None:
-        return -1
-
     if args.open_ui:
         # Imported here to avoid importing asyncio before monkey patch
         from homeassistant.util.async_ import run_callback_threadsafe
 
         def open_browser(_: Any) -> None:
             """Open the web interface in a browser."""
-            if hass.config.api is not None:  # type: ignore
+            if hass.config.api is not None:
                 import webbrowser
-                webbrowser.open(hass.config.api.base_url)  # type: ignore
+                webbrowser.open(hass.config.api.base_url)
 
         run_callback_threadsafe(
             hass.loop,
@@ -292,7 +305,7 @@ def setup_and_run_hass(config_dir: str,
             EVENT_HOMEASSISTANT_START, open_browser
         )
 
-    return hass.start()
+    return await hass.async_run()
 
 
 def try_to_restart() -> None:
@@ -347,7 +360,20 @@ def main() -> int:
             monkey_patch.disable_c_asyncio()
         monkey_patch.patch_weakref_tasks()
 
-    attempt_use_uvloop()
+    set_loop()
+
+    # Run a simple daemon runner process on Windows to handle restarts
+    if os.name == 'nt' and '--runner' not in sys.argv:
+        nt_args = cmdline() + ['--runner']
+        while True:
+            try:
+                subprocess.check_call(nt_args)
+                sys.exit(0)
+            except KeyboardInterrupt:
+                sys.exit(0)
+            except subprocess.CalledProcessError as exc:
+                if exc.returncode != RESTART_EXIT_CODE:
+                    sys.exit(exc.returncode)
 
     args = get_arguments()
 
@@ -366,11 +392,12 @@ def main() -> int:
     if args.pid_file:
         write_pid(args.pid_file)
 
-    exit_code = setup_and_run_hass(config_dir, args)
+    from homeassistant.util.async_ import asyncio_run
+    exit_code = asyncio_run(setup_and_run_hass(config_dir, args))
     if exit_code == RESTART_EXIT_CODE and not args.runner:
         try_to_restart()
 
-    return exit_code
+    return exit_code  # type: ignore
 
 
 if __name__ == "__main__":

homeassistant/auth/__init__.py

@@ -13,9 +13,13 @@ from homeassistant.core import callback, HomeAssistant
 from homeassistant.util import dt as dt_util
 
 from . import auth_store, models
+from .const import GROUP_ID_ADMIN
 from .mfa_modules import auth_mfa_module_from_config, MultiFactorAuthModule
 from .providers import auth_provider_from_config, AuthProvider, LoginFlow
 
+EVENT_USER_ADDED = 'user_added'
+EVENT_USER_REMOVED = 'user_removed'
+
 _LOGGER = logging.getLogger(__name__)
 _MfaModuleDict = Dict[str, MultiFactorAuthModule]
 _ProviderKey = Tuple[str, Optional[str]]
@@ -74,11 +78,6 @@ class AuthManager:
             hass, self._async_create_login_flow,
             self._async_finish_login_flow)
 
-    @property
-    def active(self) -> bool:
-        """Return if any auth providers are registered."""
-        return bool(self._providers)
-
     @property
     def support_legacy(self) -> bool:
         """
@@ -101,9 +100,21 @@ class AuthManager:
         """Return a list of available auth modules."""
         return list(self._mfa_modules.values())
 
+    def get_auth_provider(self, provider_type: str, provider_id: str) \
+            -> Optional[AuthProvider]:
+        """Return an auth provider, None if not found."""
+        return self._providers.get((provider_type, provider_id))
+
+    def get_auth_providers(self, provider_type: str) \
+            -> List[AuthProvider]:
+        """Return a List of auth provider of one type, Empty if not found."""
+        return [provider
+                for (p_type, _), provider in self._providers.items()
+                if p_type == provider_type]
+
     def get_auth_mfa_module(self, module_id: str) \
             -> Optional[MultiFactorAuthModule]:
-        """Return an multi-factor auth module, None if not found."""
+        """Return a multi-factor auth module, None if not found."""
         return self._mfa_modules.get(module_id)
 
     async def async_get_users(self) -> List[models.User]:
@@ -114,6 +125,15 @@ class AuthManager:
         """Retrieve a user."""
         return await self._store.async_get_user(user_id)
 
+    async def async_get_owner(self) -> Optional[models.User]:
+        """Retrieve the owner."""
+        users = await self.async_get_users()
+        return next((user for user in users if user.is_owner), None)
+
+    async def async_get_group(self, group_id: str) -> Optional[models.Group]:
+        """Retrieve all groups."""
+        return await self._store.async_get_group(group_id)
+
     async def async_get_user_by_credentials(
             self, credentials: models.Credentials) -> Optional[models.User]:
         """Get a user by credential, return None if not found."""
@@ -124,25 +144,41 @@ class AuthManager:
 
         return None
 
-    async def async_create_system_user(self, name: str) -> models.User:
+    async def async_create_system_user(
+            self, name: str,
+            group_ids: Optional[List[str]] = None) -> models.User:
         """Create a system user."""
-        return await self._store.async_create_user(
+        user = await self._store.async_create_user(
             name=name,
             system_generated=True,
             is_active=True,
+            group_ids=group_ids or [],
         )
 
+        self.hass.bus.async_fire(EVENT_USER_ADDED, {
+            'user_id': user.id
+        })
+
+        return user
+
     async def async_create_user(self, name: str) -> models.User:
         """Create a user."""
         kwargs = {
             'name': name,
             'is_active': True,
+            'group_ids': [GROUP_ID_ADMIN]
         }  # type: Dict[str, Any]
 
         if await self._user_should_be_owner():
             kwargs['is_owner'] = True
 
-        return await self._store.async_create_user(**kwargs)
+        user = await self._store.async_create_user(**kwargs)
+
+        self.hass.bus.async_fire(EVENT_USER_ADDED, {
+            'user_id': user.id
+        })
+
+        return user
 
     async def async_get_or_create_user(self, credentials: models.Credentials) \
             -> models.User:
@@ -151,8 +187,7 @@ class AuthManager:
             user = await self.async_get_user_by_credentials(credentials)
             if user is None:
                 raise ValueError('Unable to find the user.')
-            else:
-                return user
+            return user
 
         auth_provider = self._async_get_auth_provider(credentials)
 
@@ -162,12 +197,19 @@ class AuthManager:
         info = await auth_provider.async_user_meta_for_credentials(
             credentials)
 
-        return await self._store.async_create_user(
+        user = await self._store.async_create_user(
             credentials=credentials,
             name=info.name,
             is_active=info.is_active,
+            group_ids=[GROUP_ID_ADMIN],
         )
 
+        self.hass.bus.async_fire(EVENT_USER_ADDED, {
+            'user_id': user.id
+        })
+
+        return user
+
     async def async_link_user(self, user: models.User,
                               credentials: models.Credentials) -> None:
         """Link credentials to an existing user."""
@@ -185,6 +227,21 @@ class AuthManager:
 
         await self._store.async_remove_user(user)
 
+        self.hass.bus.async_fire(EVENT_USER_REMOVED, {
+            'user_id': user.id
+        })
+
+    async def async_update_user(self, user: models.User,
+                                name: Optional[str] = None,
+                                group_ids: Optional[List[str]] = None) -> None:
+        """Update a user."""
+        kwargs = {}  # type: Dict[str,Any]
+        if name is not None:
+            kwargs['name'] = name
+        if group_ids is not None:
+            kwargs['group_ids'] = group_ids
+        await self._store.async_update_user(user, **kwargs)
+
     async def async_activate_user(self, user: models.User) -> None:
         """Activate a user."""
         await self._store.async_activate_user(user)
@@ -314,7 +371,6 @@ class AuthManager:
         """Create a new access token."""
         self._store.async_log_refresh_token_usage(refresh_token, remote_ip)
 
-        # pylint: disable=no-self-use
         now = dt_util.utcnow()
         return jwt.encode({
             'iss': refresh_token.id,

homeassistant/auth/auth_store.py

@@ -1,18 +1,25 @@
 """Storage for auth models."""
+import asyncio
 from collections import OrderedDict
 from datetime import timedelta
+import hmac
 from logging import getLogger
 from typing import Any, Dict, List, Optional  # noqa: F401
-import hmac
 
 from homeassistant.auth.const import ACCESS_TOKEN_EXPIRATION
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.util import dt as dt_util
 
 from . import models
+from .const import GROUP_ID_ADMIN, GROUP_ID_USER, GROUP_ID_READ_ONLY
+from .permissions import PermissionLookup, system_policies
+from .permissions.types import PolicyType  # noqa: F401
 
 STORAGE_VERSION = 1
 STORAGE_KEY = 'auth'
+GROUP_NAME_ADMIN = 'Administrators'
+GROUP_NAME_USER = "Users"
+GROUP_NAME_READ_ONLY = 'Read Only'
 
 
 class AuthStore:
@@ -28,7 +35,27 @@ class AuthStore:
         """Initialize the auth store."""
         self.hass = hass
         self._users = None  # type: Optional[Dict[str, models.User]]
-        self._store = hass.helpers.storage.Store(STORAGE_VERSION, STORAGE_KEY)
+        self._groups = None  # type: Optional[Dict[str, models.Group]]
+        self._perm_lookup = None  # type: Optional[PermissionLookup]
+        self._store = hass.helpers.storage.Store(STORAGE_VERSION, STORAGE_KEY,
+                                                 private=True)
+        self._lock = asyncio.Lock()
+
+    async def async_get_groups(self) -> List[models.Group]:
+        """Retrieve all users."""
+        if self._groups is None:
+            await self._async_load()
+            assert self._groups is not None
+
+        return list(self._groups.values())
+
+    async def async_get_group(self, group_id: str) -> Optional[models.Group]:
+        """Retrieve all users."""
+        if self._groups is None:
+            await self._async_load()
+            assert self._groups is not None
+
+        return self._groups.get(group_id)
 
     async def async_get_users(self) -> List[models.User]:
         """Retrieve all users."""
@@ -50,14 +77,28 @@ class AuthStore:
             self, name: Optional[str], is_owner: Optional[bool] = None,
             is_active: Optional[bool] = None,
             system_generated: Optional[bool] = None,
-            credentials: Optional[models.Credentials] = None) -> models.User:
+            credentials: Optional[models.Credentials] = None,
+            group_ids: Optional[List[str]] = None) -> models.User:
         """Create a new user."""
         if self._users is None:
             await self._async_load()
-            assert self._users is not None
+
+        assert self._users is not None
+        assert self._groups is not None
+
+        groups = []
+        for group_id in (group_ids or []):
+            group = self._groups.get(group_id)
+            if group is None:
+                raise ValueError('Invalid group specified {}'.format(group_id))
+            groups.append(group)
 
         kwargs = {
-            'name': name
+            'name': name,
+            # Until we get group management, we just put everyone in the
+            # same group.
+            'groups': groups,
+            'perm_lookup': self._perm_lookup,
         }  # type: Dict[str, Any]
 
         if is_owner is not None:
@@ -97,6 +138,33 @@ class AuthStore:
         self._users.pop(user.id)
         self._async_schedule_save()
 
+    async def async_update_user(
+            self, user: models.User, name: Optional[str] = None,
+            is_active: Optional[bool] = None,
+            group_ids: Optional[List[str]] = None) -> None:
+        """Update a user."""
+        assert self._groups is not None
+
+        if group_ids is not None:
+            groups = []
+            for grid in group_ids:
+                group = self._groups.get(grid)
+                if group is None:
+                    raise ValueError("Invalid group specified.")
+                groups.append(group)
+
+            user.groups = groups
+            user.invalidate_permission_cache()
+
+        for attr_name, value in (
+                ('name', name),
+                ('is_active', is_active),
+        ):
+            if value is not None:
+                setattr(user, attr_name, value)
+
+        self._async_schedule_save()
+
     async def async_activate_user(self, user: models.User) -> None:
         """Activate a user."""
         user.is_active = True
@@ -206,21 +274,140 @@ class AuthStore:
 
     async def _async_load(self) -> None:
         """Load the users."""
-        data = await self._store.async_load()
+        async with self._lock:
+            if self._users is not None:
+                return
+            await self._async_load_task()
+
+    async def _async_load_task(self) -> None:
+        """Load the users."""
+        [ent_reg, dev_reg, data] = await asyncio.gather(
+            self.hass.helpers.entity_registry.async_get_registry(),
+            self.hass.helpers.device_registry.async_get_registry(),
+            self._store.async_load(),
+        )
 
         # Make sure that we're not overriding data if 2 loads happened at the
         # same time
         if self._users is not None:
             return
 
-        users = OrderedDict()  # type: Dict[str, models.User]
+        self._perm_lookup = perm_lookup = PermissionLookup(
+            ent_reg, dev_reg
+        )
 
         if data is None:
-            self._users = users
+            self._set_defaults()
             return
 
+        users = OrderedDict()  # type: Dict[str, models.User]
+        groups = OrderedDict()  # type: Dict[str, models.Group]
+
+        # Soft-migrating data as we load. We are going to make sure we have a
+        # read only group and an admin group. There are two states that we can
+        # migrate from:
+        # 1. Data from a recent version which has a single group without policy
+        # 2. Data from old version which has no groups
+        has_admin_group = False
+        has_user_group = False
+        has_read_only_group = False
+        group_without_policy = None
+
+        # When creating objects we mention each attribute explicitly. This
+        # prevents crashing if user rolls back HA version after a new property
+        # was added.
+
+        for group_dict in data.get('groups', []):
+            policy = None  # type: Optional[PolicyType]
+
+            if group_dict['id'] == GROUP_ID_ADMIN:
+                has_admin_group = True
+
+                name = GROUP_NAME_ADMIN
+                policy = system_policies.ADMIN_POLICY
+                system_generated = True
+
+            elif group_dict['id'] == GROUP_ID_USER:
+                has_user_group = True
+
+                name = GROUP_NAME_USER
+                policy = system_policies.USER_POLICY
+                system_generated = True
+
+            elif group_dict['id'] == GROUP_ID_READ_ONLY:
+                has_read_only_group = True
+
+                name = GROUP_NAME_READ_ONLY
+                policy = system_policies.READ_ONLY_POLICY
+                system_generated = True
+
+            else:
+                name = group_dict['name']
+                policy = group_dict.get('policy')
+                system_generated = False
+
+            # We don't want groups without a policy that are not system groups
+            # This is part of migrating from state 1
+            if policy is None:
+                group_without_policy = group_dict['id']
+                continue
+
+            groups[group_dict['id']] = models.Group(
+                id=group_dict['id'],
+                name=name,
+                policy=policy,
+                system_generated=system_generated,
+            )
+
+        # If there are no groups, add all existing users to the admin group.
+        # This is part of migrating from state 2
+        migrate_users_to_admin_group = (not groups and
+                                        group_without_policy is None)
+
+        # If we find a no_policy_group, we need to migrate all users to the
+        # admin group. We only do this if there are no other groups, as is
+        # the expected state. If not expected state, not marking people admin.
+        # This is part of migrating from state 1
+        if groups and group_without_policy is not None:
+            group_without_policy = None
+
+        # This is part of migrating from state 1 and 2
+        if not has_admin_group:
+            admin_group = _system_admin_group()
+            groups[admin_group.id] = admin_group
+
+        # This is part of migrating from state 1 and 2
+        if not has_read_only_group:
+            read_only_group = _system_read_only_group()
+            groups[read_only_group.id] = read_only_group
+
+        if not has_user_group:
+            user_group = _system_user_group()
+            groups[user_group.id] = user_group
+
         for user_dict in data['users']:
-            users[user_dict['id']] = models.User(**user_dict)
+            # Collect the users group.
+            user_groups = []
+            for group_id in user_dict.get('group_ids', []):
+                # This is part of migrating from state 1
+                if group_id == group_without_policy:
+                    group_id = GROUP_ID_ADMIN
+                user_groups.append(groups[group_id])
+
+            # This is part of migrating from state 2
+            if (not user_dict['system_generated'] and
+                    migrate_users_to_admin_group):
+                user_groups.append(groups[GROUP_ID_ADMIN])
+
+            users[user_dict['id']] = models.User(
+                name=user_dict['name'],
+                groups=user_groups,
+                id=user_dict['id'],
+                is_owner=user_dict['is_owner'],
+                is_active=user_dict['is_active'],
+                system_generated=user_dict['system_generated'],
+                perm_lookup=perm_lookup,
+            )
 
         for cred_dict in data['credentials']:
             users[cred_dict['user_id']].credentials.append(models.Credentials(
@@ -275,6 +462,7 @@ class AuthStore:
             )
             users[rt_dict['user_id']].refresh_tokens[token.id] = token
 
+        self._groups = groups
         self._users = users
 
     @callback
@@ -289,10 +477,12 @@ class AuthStore:
     def _data_to_save(self) -> Dict:
         """Return the data to store."""
         assert self._users is not None
+        assert self._groups is not None
 
         users = [
             {
                 'id': user.id,
+                'group_ids': [group.id for group in user.groups],
                 'is_owner': user.is_owner,
                 'is_active': user.is_active,
                 'name': user.name,
@@ -301,6 +491,19 @@ class AuthStore:
             for user in self._users.values()
         ]
 
+        groups = []
+        for group in self._groups.values():
+            g_dict = {
+                'id': group.id,
+                # Name not read for sys groups. Kept here for backwards compat
+                'name': group.name
+            }  # type: Dict[str, Any]
+
+            if not group.system_generated:
+                g_dict['policy'] = group.policy
+
+            groups.append(g_dict)
+
         credentials = [
             {
                 'id': credential.id,
@@ -337,6 +540,50 @@ class AuthStore:
 
         return {
             'users': users,
+            'groups': groups,
             'credentials': credentials,
             'refresh_tokens': refresh_tokens,
         }
+
+    def _set_defaults(self) -> None:
+        """Set default values for auth store."""
+        self._users = OrderedDict()  # type: Dict[str, models.User]
+
+        groups = OrderedDict()  # type: Dict[str, models.Group]
+        admin_group = _system_admin_group()
+        groups[admin_group.id] = admin_group
+        user_group = _system_user_group()
+        groups[user_group.id] = user_group
+        read_only_group = _system_read_only_group()
+        groups[read_only_group.id] = read_only_group
+        self._groups = groups
+
+
+def _system_admin_group() -> models.Group:
+    """Create system admin group."""
+    return models.Group(
+        name=GROUP_NAME_ADMIN,
+        id=GROUP_ID_ADMIN,
+        policy=system_policies.ADMIN_POLICY,
+        system_generated=True,
+    )
+
+
+def _system_user_group() -> models.Group:
+    """Create system user group."""
+    return models.Group(
+        name=GROUP_NAME_USER,
+        id=GROUP_ID_USER,
+        policy=system_policies.USER_POLICY,
+        system_generated=True,
+    )
+
+
+def _system_read_only_group() -> models.Group:
+    """Create read only group."""
+    return models.Group(
+        name=GROUP_NAME_READ_ONLY,
+        id=GROUP_ID_READ_ONLY,
+        policy=system_policies.READ_ONLY_POLICY,
+        system_generated=True,
+    )

homeassistant/auth/const.py

@@ -2,3 +2,8 @@
 from datetime import timedelta
 
 ACCESS_TOKEN_EXPIRATION = timedelta(minutes=30)
+MFA_SESSION_EXPIRATION = timedelta(minutes=5)
+
+GROUP_ID_ADMIN = 'system-admin'
+GROUP_ID_USER = 'system-users'
+GROUP_ID_READ_ONLY = 'system-read-only'

homeassistant/auth/mfa_modules/__init__.py

@@ -1,5 +1,4 @@
 """Plugable auth modules for Home Assistant."""
-from datetime import timedelta
 import importlib
 import logging
 import types
@@ -23,8 +22,6 @@ MULTI_FACTOR_AUTH_MODULE_SCHEMA = vol.Schema({
     vol.Optional(CONF_ID): str,
 }, extra=vol.ALLOW_EXTRA)
 
-SESSION_EXPIRATION = timedelta(minutes=5)
-
 DATA_REQS = 'mfa_auth_module_reqs_processed'
 
 _LOGGER = logging.getLogger(__name__)
@@ -34,6 +31,7 @@ class MultiFactorAuthModule:
     """Multi-factor Auth Module of validation function."""
 
     DEFAULT_TITLE = 'Unnamed auth module'
+    MAX_RETRY_TIME = 3
 
     def __init__(self, hass: HomeAssistant, config: Dict[str, Any]) -> None:
         """Initialize an auth module."""
@@ -84,7 +82,7 @@ class MultiFactorAuthModule:
         """Return whether user is setup."""
         raise NotImplementedError
 
-    async def async_validation(
+    async def async_validate(
             self, user_id: str, user_input: Dict[str, Any]) -> bool:
         """Return True if validation passed."""
         raise NotImplementedError
@@ -106,7 +104,7 @@ class SetupFlow(data_entry_flow.FlowHandler):
             -> Dict[str, Any]:
         """Handle the first step of setup flow.
 
-        Return self.async_show_form(step_id='init') if user_input == None.
+        Return self.async_show_form(step_id='init') if user_input is None.
         Return self.async_create_entry(data={'result': result}) if finish.
         """
         errors = {}  # type: Dict[str, str]

homeassistant/auth/mfa_modules/insecure_example.py

@@ -77,7 +77,7 @@ class InsecureExampleModule(MultiFactorAuthModule):
                 return True
         return False
 
-    async def async_validation(
+    async def async_validate(
             self, user_id: str, user_input: Dict[str, Any]) -> bool:
         """Return True if validation passed."""
         for data in self._data:

homeassistant/auth/mfa_modules/notify.py

@@ -0,0 +1,335 @@
+"""HMAC-based One-time Password auth module.
+
+Sending HOTP through notify service
+"""
+import asyncio
+import logging
+from collections import OrderedDict
+from typing import Any, Dict, Optional, List
+
+import attr
+import voluptuous as vol
+
+from homeassistant.const import CONF_EXCLUDE, CONF_INCLUDE
+from homeassistant.core import HomeAssistant, callback
+from homeassistant.exceptions import ServiceNotFound
+from homeassistant.helpers import config_validation as cv
+
+from . import MultiFactorAuthModule, MULTI_FACTOR_AUTH_MODULES, \
+    MULTI_FACTOR_AUTH_MODULE_SCHEMA, SetupFlow
+
+REQUIREMENTS = ['pyotp==2.2.7']
+
+CONF_MESSAGE = 'message'
+
+CONFIG_SCHEMA = MULTI_FACTOR_AUTH_MODULE_SCHEMA.extend({
+    vol.Optional(CONF_INCLUDE): vol.All(cv.ensure_list, [cv.string]),
+    vol.Optional(CONF_EXCLUDE): vol.All(cv.ensure_list, [cv.string]),
+    vol.Optional(CONF_MESSAGE,
+                 default='{} is your Home Assistant login code'): str
+}, extra=vol.PREVENT_EXTRA)
+
+STORAGE_VERSION = 1
+STORAGE_KEY = 'auth_module.notify'
+STORAGE_USERS = 'users'
+STORAGE_USER_ID = 'user_id'
+
+INPUT_FIELD_CODE = 'code'
+
+_LOGGER = logging.getLogger(__name__)
+
+
+def _generate_secret() -> str:
+    """Generate a secret."""
+    import pyotp
+    return str(pyotp.random_base32())
+
+
+def _generate_random() -> int:
+    """Generate a 8 digit number."""
+    import pyotp
+    return int(pyotp.random_base32(length=8, chars=list('1234567890')))
+
+
+def _generate_otp(secret: str, count: int) -> str:
+    """Generate one time password."""
+    import pyotp
+    return str(pyotp.HOTP(secret).at(count))
+
+
+def _verify_otp(secret: str, otp: str, count: int) -> bool:
+    """Verify one time password."""
+    import pyotp
+    return bool(pyotp.HOTP(secret).verify(otp, count))
+
+
+@attr.s(slots=True)
+class NotifySetting:
+    """Store notify setting for one user."""
+
+    secret = attr.ib(type=str, factory=_generate_secret)   # not persistent
+    counter = attr.ib(type=int, factory=_generate_random)  # not persistent
+    notify_service = attr.ib(type=Optional[str], default=None)
+    target = attr.ib(type=Optional[str], default=None)
+
+
+_UsersDict = Dict[str, NotifySetting]
+
+
+@MULTI_FACTOR_AUTH_MODULES.register('notify')
+class NotifyAuthModule(MultiFactorAuthModule):
+    """Auth module send hmac-based one time password by notify service."""
+
+    DEFAULT_TITLE = 'Notify One-Time Password'
+
+    def __init__(self, hass: HomeAssistant, config: Dict[str, Any]) -> None:
+        """Initialize the user data store."""
+        super().__init__(hass, config)
+        self._user_settings = None  # type: Optional[_UsersDict]
+        self._user_store = hass.helpers.storage.Store(
+            STORAGE_VERSION, STORAGE_KEY, private=True)
+        self._include = config.get(CONF_INCLUDE, [])
+        self._exclude = config.get(CONF_EXCLUDE, [])
+        self._message_template = config[CONF_MESSAGE]
+        self._init_lock = asyncio.Lock()
+
+    @property
+    def input_schema(self) -> vol.Schema:
+        """Validate login flow input data."""
+        return vol.Schema({INPUT_FIELD_CODE: str})
+
+    async def _async_load(self) -> None:
+        """Load stored data."""
+        async with self._init_lock:
+            if self._user_settings is not None:
+                return
+
+            data = await self._user_store.async_load()
+
+            if data is None:
+                data = {STORAGE_USERS: {}}
+
+            self._user_settings = {
+                user_id: NotifySetting(**setting)
+                for user_id, setting in data.get(STORAGE_USERS, {}).items()
+            }
+
+    async def _async_save(self) -> None:
+        """Save data."""
+        if self._user_settings is None:
+            return
+
+        await self._user_store.async_save({STORAGE_USERS: {
+            user_id: attr.asdict(
+                notify_setting, filter=attr.filters.exclude(
+                    attr.fields(NotifySetting).secret,
+                    attr.fields(NotifySetting).counter,
+                ))
+            for user_id, notify_setting
+            in self._user_settings.items()
+        }})
+
+    @callback
+    def aync_get_available_notify_services(self) -> List[str]:
+        """Return list of notify services."""
+        unordered_services = set()
+
+        for service in self.hass.services.async_services().get('notify', {}):
+            if service not in self._exclude:
+                unordered_services.add(service)
+
+        if self._include:
+            unordered_services &= set(self._include)
+
+        return sorted(unordered_services)
+
+    async def async_setup_flow(self, user_id: str) -> SetupFlow:
+        """Return a data entry flow handler for setup module.
+
+        Mfa module should extend SetupFlow
+        """
+        return NotifySetupFlow(
+            self, self.input_schema, user_id,
+            self.aync_get_available_notify_services())
+
+    async def async_setup_user(self, user_id: str, setup_data: Any) -> Any:
+        """Set up auth module for user."""
+        if self._user_settings is None:
+            await self._async_load()
+            assert self._user_settings is not None
+
+        self._user_settings[user_id] = NotifySetting(
+            notify_service=setup_data.get('notify_service'),
+            target=setup_data.get('target'),
+        )
+
+        await self._async_save()
+
+    async def async_depose_user(self, user_id: str) -> None:
+        """Depose auth module for user."""
+        if self._user_settings is None:
+            await self._async_load()
+            assert self._user_settings is not None
+
+        if self._user_settings.pop(user_id, None):
+            await self._async_save()
+
+    async def async_is_user_setup(self, user_id: str) -> bool:
+        """Return whether user is setup."""
+        if self._user_settings is None:
+            await self._async_load()
+            assert self._user_settings is not None
+
+        return user_id in self._user_settings
+
+    async def async_validate(
+            self, user_id: str, user_input: Dict[str, Any]) -> bool:
+        """Return True if validation passed."""
+        if self._user_settings is None:
+            await self._async_load()
+            assert self._user_settings is not None
+
+        notify_setting = self._user_settings.get(user_id, None)
+        if notify_setting is None:
+            return False
+
+        # user_input has been validate in caller
+        return await self.hass.async_add_executor_job(
+            _verify_otp, notify_setting.secret,
+            user_input.get(INPUT_FIELD_CODE, ''),
+            notify_setting.counter)
+
+    async def async_initialize_login_mfa_step(self, user_id: str) -> None:
+        """Generate code and notify user."""
+        if self._user_settings is None:
+            await self._async_load()
+            assert self._user_settings is not None
+
+        notify_setting = self._user_settings.get(user_id, None)
+        if notify_setting is None:
+            raise ValueError('Cannot find user_id')
+
+        def generate_secret_and_one_time_password() -> str:
+            """Generate and send one time password."""
+            assert notify_setting
+            # secret and counter are not persistent
+            notify_setting.secret = _generate_secret()
+            notify_setting.counter = _generate_random()
+            return _generate_otp(
+                notify_setting.secret, notify_setting.counter)
+
+        code = await self.hass.async_add_executor_job(
+            generate_secret_and_one_time_password)
+
+        await self.async_notify_user(user_id, code)
+
+    async def async_notify_user(self, user_id: str, code: str) -> None:
+        """Send code by user's notify service."""
+        if self._user_settings is None:
+            await self._async_load()
+            assert self._user_settings is not None
+
+        notify_setting = self._user_settings.get(user_id, None)
+        if notify_setting is None:
+            _LOGGER.error('Cannot find user %s', user_id)
+            return
+
+        await self.async_notify(   # type: ignore
+            code, notify_setting.notify_service, notify_setting.target)
+
+    async def async_notify(self, code: str, notify_service: str,
+                           target: Optional[str] = None) -> None:
+        """Send code by notify service."""
+        data = {'message': self._message_template.format(code)}
+        if target:
+            data['target'] = [target]
+
+        await self.hass.services.async_call('notify', notify_service, data)
+
+
+class NotifySetupFlow(SetupFlow):
+    """Handler for the setup flow."""
+
+    def __init__(self, auth_module: NotifyAuthModule,
+                 setup_schema: vol.Schema,
+                 user_id: str,
+                 available_notify_services: List[str]) -> None:
+        """Initialize the setup flow."""
+        super().__init__(auth_module, setup_schema, user_id)
+        # to fix typing complaint
+        self._auth_module = auth_module  # type: NotifyAuthModule
+        self._available_notify_services = available_notify_services
+        self._secret = None  # type: Optional[str]
+        self._count = None   # type: Optional[int]
+        self._notify_service = None  # type: Optional[str]
+        self._target = None  # type: Optional[str]
+
+    async def async_step_init(
+            self, user_input: Optional[Dict[str, str]] = None) \
+            -> Dict[str, Any]:
+        """Let user select available notify services."""
+        errors = {}  # type: Dict[str, str]
+
+        hass = self._auth_module.hass
+        if user_input:
+            self._notify_service = user_input['notify_service']
+            self._target = user_input.get('target')
+            self._secret = await hass.async_add_executor_job(_generate_secret)
+            self._count = await hass.async_add_executor_job(_generate_random)
+
+            return await self.async_step_setup()
+
+        if not self._available_notify_services:
+            return self.async_abort(reason='no_available_service')
+
+        schema = OrderedDict()  # type: Dict[str, Any]
+        schema['notify_service'] = vol.In(self._available_notify_services)
+        schema['target'] = vol.Optional(str)
+
+        return self.async_show_form(
+            step_id='init',
+            data_schema=vol.Schema(schema),
+            errors=errors
+        )
+
+    async def async_step_setup(
+            self, user_input: Optional[Dict[str, str]] = None) \
+            -> Dict[str, Any]:
+        """Verify user can recevie one-time password."""
+        errors = {}  # type: Dict[str, str]
+
+        hass = self._auth_module.hass
+        if user_input:
+            verified = await hass.async_add_executor_job(
+                _verify_otp, self._secret, user_input['code'], self._count)
+            if verified:
+                await self._auth_module.async_setup_user(
+                    self._user_id, {
+                        'notify_service': self._notify_service,
+                        'target': self._target,
+                    })
+                return self.async_create_entry(
+                    title=self._auth_module.name,
+                    data={}
+                )
+
+            errors['base'] = 'invalid_code'
+
+        # generate code every time, no retry logic
+        assert self._secret and self._count
+        code = await hass.async_add_executor_job(
+            _generate_otp, self._secret, self._count)
+
+        assert self._notify_service
+        try:
+            await self._auth_module.async_notify(
+                code, self._notify_service, self._target)
+        except ServiceNotFound:
+            return self.async_abort(reason='notify_service_not_exist')
+
+        return self.async_show_form(
+            step_id='setup',
+            data_schema=self._setup_schema,
+            description_placeholders={'notify_service': self._notify_service},
+            errors=errors,
+        )

homeassistant/auth/mfa_modules/totp.py

@@ -1,4 +1,5 @@
 """Time-based One Time Password auth module."""
+import asyncio
 import logging
 from io import BytesIO
 from typing import Any, Dict, Optional, Tuple  # noqa: F401
@@ -11,7 +12,7 @@ from homeassistant.core import HomeAssistant
 from . import MultiFactorAuthModule, MULTI_FACTOR_AUTH_MODULES, \
     MULTI_FACTOR_AUTH_MODULE_SCHEMA, SetupFlow
 
-REQUIREMENTS = ['pyotp==2.2.6', 'PyQRCode==1.2.1']
+REQUIREMENTS = ['pyotp==2.2.7', 'PyQRCode==1.2.1']
 
 CONFIG_SCHEMA = MULTI_FACTOR_AUTH_MODULE_SCHEMA.extend({
 }, extra=vol.PREVENT_EXTRA)
@@ -60,13 +61,15 @@ class TotpAuthModule(MultiFactorAuthModule):
     """Auth module validate time-based one time password."""
 
     DEFAULT_TITLE = 'Time-based One Time Password'
+    MAX_RETRY_TIME = 5
 
     def __init__(self, hass: HomeAssistant, config: Dict[str, Any]) -> None:
         """Initialize the user data store."""
         super().__init__(hass, config)
         self._users = None  # type: Optional[Dict[str, str]]
         self._user_store = hass.helpers.storage.Store(
-            STORAGE_VERSION, STORAGE_KEY)
+            STORAGE_VERSION, STORAGE_KEY, private=True)
+        self._init_lock = asyncio.Lock()
 
     @property
     def input_schema(self) -> vol.Schema:
@@ -75,12 +78,16 @@ class TotpAuthModule(MultiFactorAuthModule):
 
     async def _async_load(self) -> None:
         """Load stored data."""
-        data = await self._user_store.async_load()
+        async with self._init_lock:
+            if self._users is not None:
+                return
 
-        if data is None:
-            data = {STORAGE_USERS: {}}
+            data = await self._user_store.async_load()
 
-        self._users = data.get(STORAGE_USERS, {})
+            if data is None:
+                data = {STORAGE_USERS: {}}
+
+            self._users = data.get(STORAGE_USERS, {})
 
     async def _async_save(self) -> None:
         """Save data."""
@@ -130,7 +137,7 @@ class TotpAuthModule(MultiFactorAuthModule):
 
         return user_id in self._users   # type: ignore
 
-    async def async_validation(
+    async def async_validate(
             self, user_id: str, user_input: Dict[str, Any]) -> bool:
         """Return True if validation passed."""
         if self._users is None:
@@ -149,10 +156,10 @@ class TotpAuthModule(MultiFactorAuthModule):
         if ota_secret is None:
             # even we cannot find user, we still do verify
             # to make timing the same as if user was found.
-            pyotp.TOTP(DUMMY_SECRET).verify(code)
+            pyotp.TOTP(DUMMY_SECRET).verify(code, valid_window=1)
             return False
 
-        return bool(pyotp.TOTP(ota_secret).verify(code))
+        return bool(pyotp.TOTP(ota_secret).verify(code, valid_window=1))
 
 
 class TotpSetupFlow(SetupFlow):
@@ -175,7 +182,7 @@ class TotpSetupFlow(SetupFlow):
             -> Dict[str, Any]:
         """Handle the first step of setup flow.
 
-        Return self.async_show_form(step_id='init') if user_input == None.
+        Return self.async_show_form(step_id='init') if user_input is None.
         Return self.async_create_entry(data={'result': result}) if finish.
         """
         import pyotp

homeassistant/auth/models.py

@@ -7,6 +7,8 @@ import attr
 
 from homeassistant.util import dt as dt_util
 
+from . import permissions as perm_mdl
+from .const import GROUP_ID_ADMIN
 from .util import generate_secret
 
 TOKEN_TYPE_NORMAL = 'normal'
@@ -14,26 +16,77 @@ TOKEN_TYPE_SYSTEM = 'system'
 TOKEN_TYPE_LONG_LIVED_ACCESS_TOKEN = 'long_lived_access_token'
 
 
+@attr.s(slots=True)
+class Group:
+    """A group."""
+
+    name = attr.ib(type=str)  # type: Optional[str]
+    policy = attr.ib(type=perm_mdl.PolicyType)
+    id = attr.ib(type=str, factory=lambda: uuid.uuid4().hex)
+    system_generated = attr.ib(type=bool, default=False)
+
+
 @attr.s(slots=True)
 class User:
     """A user."""
 
     name = attr.ib(type=str)  # type: Optional[str]
-    id = attr.ib(type=str, default=attr.Factory(lambda: uuid.uuid4().hex))
+    perm_lookup = attr.ib(
+        type=perm_mdl.PermissionLookup, cmp=False,
+    )  # type: perm_mdl.PermissionLookup
+    id = attr.ib(type=str, factory=lambda: uuid.uuid4().hex)
     is_owner = attr.ib(type=bool, default=False)
     is_active = attr.ib(type=bool, default=False)
     system_generated = attr.ib(type=bool, default=False)
 
+    groups = attr.ib(type=List, factory=list, cmp=False)  # type: List[Group]
+
     # List of credentials of a user.
     credentials = attr.ib(
-        type=list, default=attr.Factory(list), cmp=False
+        type=list, factory=list, cmp=False
     )  # type: List[Credentials]
 
     # Tokens associated with a user.
     refresh_tokens = attr.ib(
-        type=dict, default=attr.Factory(dict), cmp=False
+        type=dict, factory=dict, cmp=False
     )  # type: Dict[str, RefreshToken]
 
+    _permissions = attr.ib(
+        type=Optional[perm_mdl.PolicyPermissions],
+        init=False,
+        cmp=False,
+        default=None,
+    )
+
+    @property
+    def permissions(self) -> perm_mdl.AbstractPermissions:
+        """Return permissions object for user."""
+        if self.is_owner:
+            return perm_mdl.OwnerPermissions
+
+        if self._permissions is not None:
+            return self._permissions
+
+        self._permissions = perm_mdl.PolicyPermissions(
+            perm_mdl.merge_policies([
+                group.policy for group in self.groups]),
+            self.perm_lookup)
+
+        return self._permissions
+
+    @property
+    def is_admin(self) -> bool:
+        """Return if user is part of the admin group."""
+        if self.is_owner:
+            return True
+
+        return self.is_active and any(
+            gr.id == GROUP_ID_ADMIN for gr in self.groups)
+
+    def invalidate_permission_cache(self) -> None:
+        """Invalidate permission cache."""
+        self._permissions = None
+
 
 @attr.s(slots=True)
 class RefreshToken:
@@ -48,12 +101,10 @@ class RefreshToken:
                          validator=attr.validators.in_((
                              TOKEN_TYPE_NORMAL, TOKEN_TYPE_SYSTEM,
                              TOKEN_TYPE_LONG_LIVED_ACCESS_TOKEN)))
-    id = attr.ib(type=str, default=attr.Factory(lambda: uuid.uuid4().hex))
-    created_at = attr.ib(type=datetime, default=attr.Factory(dt_util.utcnow))
-    token = attr.ib(type=str,
-                    default=attr.Factory(lambda: generate_secret(64)))
-    jwt_key = attr.ib(type=str,
-                      default=attr.Factory(lambda: generate_secret(64)))
+    id = attr.ib(type=str, factory=lambda: uuid.uuid4().hex)
+    created_at = attr.ib(type=datetime, factory=dt_util.utcnow)
+    token = attr.ib(type=str, factory=lambda: generate_secret(64))
+    jwt_key = attr.ib(type=str, factory=lambda: generate_secret(64))
 
     last_used_at = attr.ib(type=Optional[datetime], default=None)
     last_used_ip = attr.ib(type=Optional[str], default=None)
@@ -69,7 +120,7 @@ class Credentials:
     # Allow the auth provider to store data to represent their auth.
     data = attr.ib(type=dict)
 
-    id = attr.ib(type=str, default=attr.Factory(lambda: uuid.uuid4().hex))
+    id = attr.ib(type=str, factory=lambda: uuid.uuid4().hex)
     is_new = attr.ib(type=bool, default=True)
 
 

homeassistant/auth/permissions/__init__.py

@@ -0,0 +1,86 @@
+"""Permissions for Home Assistant."""
+import logging
+from typing import (  # noqa: F401
+    cast, Any, Callable, Dict, List, Mapping, Set, Tuple, Union,
+    TYPE_CHECKING)
+
+import voluptuous as vol
+
+from .const import CAT_ENTITIES
+from .models import PermissionLookup
+from .types import PolicyType
+from .entities import ENTITY_POLICY_SCHEMA, compile_entities
+from .merge import merge_policies  # noqa
+from .util import test_all
+
+
+POLICY_SCHEMA = vol.Schema({
+    vol.Optional(CAT_ENTITIES): ENTITY_POLICY_SCHEMA
+})
+
+_LOGGER = logging.getLogger(__name__)
+
+
+class AbstractPermissions:
+    """Default permissions class."""
+
+    _cached_entity_func = None
+
+    def _entity_func(self) -> Callable[[str, str], bool]:
+        """Return a function that can test entity access."""
+        raise NotImplementedError
+
+    def access_all_entities(self, key: str) -> bool:
+        """Check if we have a certain access to all entities."""
+        raise NotImplementedError
+
+    def check_entity(self, entity_id: str, key: str) -> bool:
+        """Check if we can access entity."""
+        entity_func = self._cached_entity_func
+
+        if entity_func is None:
+            entity_func = self._cached_entity_func = self._entity_func()
+
+        return entity_func(entity_id, key)
+
+
+class PolicyPermissions(AbstractPermissions):
+    """Handle permissions."""
+
+    def __init__(self, policy: PolicyType,
+                 perm_lookup: PermissionLookup) -> None:
+        """Initialize the permission class."""
+        self._policy = policy
+        self._perm_lookup = perm_lookup
+
+    def access_all_entities(self, key: str) -> bool:
+        """Check if we have a certain access to all entities."""
+        return test_all(self._policy.get(CAT_ENTITIES), key)
+
+    def _entity_func(self) -> Callable[[str, str], bool]:
+        """Return a function that can test entity access."""
+        return compile_entities(self._policy.get(CAT_ENTITIES),
+                                self._perm_lookup)
+
+    def __eq__(self, other: Any) -> bool:
+        """Equals check."""
+        # pylint: disable=protected-access
+        return (isinstance(other, PolicyPermissions) and
+                other._policy == self._policy)
+
+
+class _OwnerPermissions(AbstractPermissions):
+    """Owner permissions."""
+
+    # pylint: disable=no-self-use
+
+    def access_all_entities(self, key: str) -> bool:
+        """Check if we have a certain access to all entities."""
+        return True
+
+    def _entity_func(self) -> Callable[[str, str], bool]:
+        """Return a function that can test entity access."""
+        return lambda entity_id, key: True
+
+
+OwnerPermissions = _OwnerPermissions()  # pylint: disable=invalid-name

homeassistant/auth/permissions/const.py

@@ -0,0 +1,8 @@
+"""Permission constants."""
+CAT_ENTITIES = 'entities'
+CAT_CONFIG_ENTRIES = 'config_entries'
+SUBCAT_ALL = 'all'
+
+POLICY_READ = 'read'
+POLICY_CONTROL = 'control'
+POLICY_EDIT = 'edit'

homeassistant/auth/permissions/entities.py

@@ -0,0 +1,91 @@
+"""Entity permissions."""
+from collections import OrderedDict
+from typing import Callable, Optional  # noqa: F401
+
+import voluptuous as vol
+
+from .const import SUBCAT_ALL, POLICY_READ, POLICY_CONTROL, POLICY_EDIT
+from .models import PermissionLookup
+from .types import CategoryType, SubCategoryDict, ValueType
+# pylint: disable=unused-import
+from .util import SubCatLookupType, lookup_all, compile_policy  # noqa
+
+SINGLE_ENTITY_SCHEMA = vol.Any(True, vol.Schema({
+    vol.Optional(POLICY_READ): True,
+    vol.Optional(POLICY_CONTROL): True,
+    vol.Optional(POLICY_EDIT): True,
+}))
+
+ENTITY_DOMAINS = 'domains'
+ENTITY_AREAS = 'area_ids'
+ENTITY_DEVICE_IDS = 'device_ids'
+ENTITY_ENTITY_IDS = 'entity_ids'
+
+ENTITY_VALUES_SCHEMA = vol.Any(True, vol.Schema({
+    str: SINGLE_ENTITY_SCHEMA
+}))
+
+ENTITY_POLICY_SCHEMA = vol.Any(True, vol.Schema({
+    vol.Optional(SUBCAT_ALL): SINGLE_ENTITY_SCHEMA,
+    vol.Optional(ENTITY_AREAS): ENTITY_VALUES_SCHEMA,
+    vol.Optional(ENTITY_DEVICE_IDS): ENTITY_VALUES_SCHEMA,
+    vol.Optional(ENTITY_DOMAINS): ENTITY_VALUES_SCHEMA,
+    vol.Optional(ENTITY_ENTITY_IDS): ENTITY_VALUES_SCHEMA,
+}))
+
+
+def _lookup_domain(perm_lookup: PermissionLookup,
+                   domains_dict: SubCategoryDict,
+                   entity_id: str) -> Optional[ValueType]:
+    """Look up entity permissions by domain."""
+    return domains_dict.get(entity_id.split(".", 1)[0])
+
+
+def _lookup_area(perm_lookup: PermissionLookup, area_dict: SubCategoryDict,
+                 entity_id: str) -> Optional[ValueType]:
+    """Look up entity permissions by area."""
+    entity_entry = perm_lookup.entity_registry.async_get(entity_id)
+
+    if entity_entry is None or entity_entry.device_id is None:
+        return None
+
+    device_entry = perm_lookup.device_registry.async_get(
+        entity_entry.device_id
+    )
+
+    if device_entry is None or device_entry.area_id is None:
+        return None
+
+    return area_dict.get(device_entry.area_id)
+
+
+def _lookup_device(perm_lookup: PermissionLookup,
+                   devices_dict: SubCategoryDict,
+                   entity_id: str) -> Optional[ValueType]:
+    """Look up entity permissions by device."""
+    entity_entry = perm_lookup.entity_registry.async_get(entity_id)
+
+    if entity_entry is None or entity_entry.device_id is None:
+        return None
+
+    return devices_dict.get(entity_entry.device_id)
+
+
+def _lookup_entity_id(perm_lookup: PermissionLookup,
+                      entities_dict: SubCategoryDict,
+                      entity_id: str) -> Optional[ValueType]:
+    """Look up entity permission by entity id."""
+    return entities_dict.get(entity_id)
+
+
+def compile_entities(policy: CategoryType, perm_lookup: PermissionLookup) \
+        -> Callable[[str, str], bool]:
+    """Compile policy into a function that tests policy."""
+    subcategories = OrderedDict()  # type: SubCatLookupType
+    subcategories[ENTITY_ENTITY_IDS] = _lookup_entity_id
+    subcategories[ENTITY_DEVICE_IDS] = _lookup_device
+    subcategories[ENTITY_AREAS] = _lookup_area
+    subcategories[ENTITY_DOMAINS] = _lookup_domain
+    subcategories[SUBCAT_ALL] = lookup_all
+
+    return compile_policy(policy, subcategories, perm_lookup)

homeassistant/auth/permissions/merge.py

@@ -0,0 +1,65 @@
+"""Merging of policies."""
+from typing import (  # noqa: F401
+    cast, Dict, List, Set)
+
+from .types import PolicyType, CategoryType
+
+
+def merge_policies(policies: List[PolicyType]) -> PolicyType:
+    """Merge policies."""
+    new_policy = {}  # type: Dict[str, CategoryType]
+    seen = set()  # type: Set[str]
+    for policy in policies:
+        for category in policy:
+            if category in seen:
+                continue
+            seen.add(category)
+            new_policy[category] = _merge_policies([
+                policy.get(category) for policy in policies])
+    cast(PolicyType, new_policy)
+    return new_policy
+
+
+def _merge_policies(sources: List[CategoryType]) -> CategoryType:
+    """Merge a policy."""
+    # When merging policies, the most permissive wins.
+    # This means we order it like this:
+    # True > Dict > None
+    #
+    # True: allow everything
+    # Dict: specify more granular permissions
+    # None: no opinion
+    #
+    # If there are multiple sources with a dict as policy, we recursively
+    # merge each key in the source.
+
+    policy = None  # type: CategoryType
+    seen = set()  # type: Set[str]
+    for source in sources:
+        if source is None:
+            continue
+
+        # A source that's True will always win. Shortcut return.
+        if source is True:
+            return True
+
+        assert isinstance(source, dict)
+
+        if policy is None:
+            policy = cast(CategoryType, {})
+
+        assert isinstance(policy, dict)
+
+        for key in source:
+            if key in seen:
+                continue
+            seen.add(key)
+
+            key_sources = []
+            for src in sources:
+                if isinstance(src, dict):
+                    key_sources.append(src.get(key))
+
+            policy[key] = _merge_policies(key_sources)
+
+    return policy

homeassistant/auth/permissions/models.py

@@ -0,0 +1,21 @@
+"""Models for permissions."""
+from typing import TYPE_CHECKING
+
+import attr
+
+if TYPE_CHECKING:
+    # pylint: disable=unused-import
+    from homeassistant.helpers import (  # noqa
+        entity_registry as ent_reg,
+    )
+    from homeassistant.helpers import (  # noqa
+        device_registry as dev_reg,
+    )
+
+
+@attr.s(slots=True)
+class PermissionLookup:
+    """Class to hold data for permission lookups."""
+
+    entity_registry = attr.ib(type='ent_reg.EntityRegistry')
+    device_registry = attr.ib(type='dev_reg.DeviceRegistry')

homeassistant/auth/permissions/system_policies.py

@@ -0,0 +1,18 @@
+"""System policies."""
+from .const import CAT_ENTITIES, SUBCAT_ALL, POLICY_READ
+
+ADMIN_POLICY = {
+    CAT_ENTITIES: True,
+}
+
+USER_POLICY = {
+    CAT_ENTITIES: True,
+}
+
+READ_ONLY_POLICY = {
+    CAT_ENTITIES: {
+        SUBCAT_ALL: {
+            POLICY_READ: True
+        }
+    }
+}

homeassistant/auth/permissions/types.py

@@ -0,0 +1,32 @@
+"""Common code for permissions."""
+from typing import Mapping, Union
+
+# MyPy doesn't support recursion yet. So writing it out as far as we need.
+
+ValueType = Union[
+    # Example: entities.all = { read: true, control: true }
+    Mapping[str, bool],
+    bool,
+    None
+]
+
+# Example: entities.domains = { light: … }
+SubCategoryDict = Mapping[str, ValueType]
+
+SubCategoryType = Union[
+    SubCategoryDict,
+    bool,
+    None
+]
+
+CategoryType = Union[
+    # Example: entities.domains
+    Mapping[str, SubCategoryType],
+    # Example: entities.all
+    Mapping[str, ValueType],
+    bool,
+    None
+]
+
+# Example: { entities: … }
+PolicyType = Mapping[str, CategoryType]

homeassistant/auth/permissions/util.py

@@ -0,0 +1,112 @@
+"""Helpers to deal with permissions."""
+from functools import wraps
+
+from typing import Callable, Dict, List, Optional, Union, cast  # noqa: F401
+
+from .const import SUBCAT_ALL
+from .models import PermissionLookup
+from .types import CategoryType, SubCategoryDict, ValueType
+
+LookupFunc = Callable[[PermissionLookup, SubCategoryDict, str],
+                      Optional[ValueType]]
+SubCatLookupType = Dict[str, LookupFunc]
+
+
+def lookup_all(perm_lookup: PermissionLookup, lookup_dict: SubCategoryDict,
+               object_id: str) -> ValueType:
+    """Look up permission for all."""
+    # In case of ALL category, lookup_dict IS the schema.
+    return cast(ValueType, lookup_dict)
+
+
+def compile_policy(
+        policy: CategoryType, subcategories: SubCatLookupType,
+        perm_lookup: PermissionLookup
+    ) -> Callable[[str, str], bool]:  # noqa
+    """Compile policy into a function that tests policy.
+    Subcategories are mapping key -> lookup function, ordered by highest
+    priority first.
+    """
+    # None, False, empty dict
+    if not policy:
+        def apply_policy_deny_all(entity_id: str, key: str) -> bool:
+            """Decline all."""
+            return False
+
+        return apply_policy_deny_all
+
+    if policy is True:
+        def apply_policy_allow_all(entity_id: str, key: str) -> bool:
+            """Approve all."""
+            return True
+
+        return apply_policy_allow_all
+
+    assert isinstance(policy, dict)
+
+    funcs = []  # type: List[Callable[[str, str], Union[None, bool]]]
+
+    for key, lookup_func in subcategories.items():
+        lookup_value = policy.get(key)
+
+        # If any lookup value is `True`, it will always be positive
+        if isinstance(lookup_value, bool):
+            return lambda object_id, key: True
+
+        if lookup_value is not None:
+            funcs.append(_gen_dict_test_func(
+                perm_lookup, lookup_func, lookup_value))
+
+    if len(funcs) == 1:
+        func = funcs[0]
+
+        @wraps(func)
+        def apply_policy_func(object_id: str, key: str) -> bool:
+            """Apply a single policy function."""
+            return func(object_id, key) is True
+
+        return apply_policy_func
+
+    def apply_policy_funcs(object_id: str, key: str) -> bool:
+        """Apply several policy functions."""
+        for func in funcs:
+            result = func(object_id, key)
+            if result is not None:
+                return result
+        return False
+
+    return apply_policy_funcs
+
+
+def _gen_dict_test_func(
+        perm_lookup: PermissionLookup,
+        lookup_func: LookupFunc,
+        lookup_dict: SubCategoryDict
+    ) -> Callable[[str, str], Optional[bool]]:  # noqa
+    """Generate a lookup function."""
+    def test_value(object_id: str, key: str) -> Optional[bool]:
+        """Test if permission is allowed based on the keys."""
+        schema = lookup_func(
+            perm_lookup, lookup_dict, object_id)  # type: ValueType
+
+        if schema is None or isinstance(schema, bool):
+            return schema
+
+        assert isinstance(schema, dict)
+
+        return schema.get(key)
+
+    return test_value
+
+
+def test_all(policy: CategoryType, key: str) -> bool:
+    """Test if a policy has an ALL access for a specific key."""
+    if not isinstance(policy, dict):
+        return bool(policy)
+
+    all_policy = policy.get(SUBCAT_ALL)
+
+    if not isinstance(all_policy, dict):
+        return bool(all_policy)
+
+    return all_policy.get(key, False)

homeassistant/auth/providers/__init__.py

@@ -15,8 +15,8 @@ from homeassistant.util import dt as dt_util
 from homeassistant.util.decorator import Registry
 
 from ..auth_store import AuthStore
+from ..const import MFA_SESSION_EXPIRATION
 from ..models import Credentials, User, UserMeta  # noqa: F401
-from ..mfa_modules import SESSION_EXPIRATION
 
 _LOGGER = logging.getLogger(__name__)
 DATA_REQS = 'auth_prov_reqs_processed'
@@ -171,6 +171,7 @@ class LoginFlow(data_entry_flow.FlowHandler):
         self._auth_manager = auth_provider.hass.auth  # type: ignore
         self.available_mfa_modules = {}  # type: Dict[str, str]
         self.created_at = dt_util.utcnow()
+        self.invalid_mfa_times = 0
         self.user = None  # type: Optional[User]
 
     async def async_step_init(
@@ -178,7 +179,7 @@ class LoginFlow(data_entry_flow.FlowHandler):
             -> Dict[str, Any]:
         """Handle the first step of login flow.
 
-        Return self.async_show_form(step_id='init') if user_input == None.
+        Return self.async_show_form(step_id='init') if user_input is None.
         Return await self.async_finish(flow_result) if login init step pass.
         """
         raise NotImplementedError
@@ -212,6 +213,8 @@ class LoginFlow(data_entry_flow.FlowHandler):
             self, user_input: Optional[Dict[str, str]] = None) \
             -> Dict[str, Any]:
         """Handle the step of mfa validation."""
+        assert self.user
+
         errors = {}
 
         auth_module = self._auth_manager.get_auth_mfa_module(
@@ -221,25 +224,38 @@ class LoginFlow(data_entry_flow.FlowHandler):
             # will show invalid_auth_module error
             return await self.async_step_select_mfa_module(user_input={})
 
+        if user_input is None and hasattr(auth_module,
+                                          'async_initialize_login_mfa_step'):
+            try:
+                await auth_module.async_initialize_login_mfa_step(self.user.id)
+            except HomeAssistantError:
+                _LOGGER.exception('Error initializing MFA step')
+                return self.async_abort(reason='unknown_error')
+
         if user_input is not None:
-            expires = self.created_at + SESSION_EXPIRATION
+            expires = self.created_at + MFA_SESSION_EXPIRATION
             if dt_util.utcnow() > expires:
                 return self.async_abort(
                     reason='login_expired'
                 )
 
-            result = await auth_module.async_validation(
-                self.user.id, user_input)  # type: ignore
+            result = await auth_module.async_validate(
+                self.user.id, user_input)
             if not result:
                 errors['base'] = 'invalid_code'
+                self.invalid_mfa_times += 1
+                if self.invalid_mfa_times >= auth_module.MAX_RETRY_TIME > 0:
+                    return self.async_abort(
+                        reason='too_many_retry'
+                    )
 
             if not errors:
                 return await self.async_finish(self.user)
 
         description_placeholders = {
             'mfa_module_name': auth_module.name,
-            'mfa_module_id': auth_module.id
-        }  # type: Dict[str, str]
+            'mfa_module_id': auth_module.id,
+        }  # type: Dict[str, Optional[str]]
 
         return self.async_show_form(
             step_id='mfa',

homeassistant/auth/providers/command_line.py

@@ -0,0 +1,164 @@
+"""Auth provider that validates credentials via an external command."""
+
+from typing import Any, Dict, Optional, cast
+
+import asyncio.subprocess
+import collections
+import logging
+import os
+
+import voluptuous as vol
+
+from homeassistant.exceptions import HomeAssistantError
+
+from . import AuthProvider, AUTH_PROVIDER_SCHEMA, AUTH_PROVIDERS, LoginFlow
+from ..models import Credentials, UserMeta
+
+
+CONF_COMMAND = "command"
+CONF_ARGS = "args"
+CONF_META = "meta"
+
+CONFIG_SCHEMA = AUTH_PROVIDER_SCHEMA.extend({
+    vol.Required(CONF_COMMAND): vol.All(
+        str,
+        os.path.normpath,
+        msg="must be an absolute path"
+    ),
+    vol.Optional(CONF_ARGS, default=None): vol.Any(vol.DefaultTo(list), [str]),
+    vol.Optional(CONF_META, default=False): bool,
+}, extra=vol.PREVENT_EXTRA)
+
+_LOGGER = logging.getLogger(__name__)
+
+
+class InvalidAuthError(HomeAssistantError):
+    """Raised when authentication with given credentials fails."""
+
+
+@AUTH_PROVIDERS.register("command_line")
+class CommandLineAuthProvider(AuthProvider):
+    """Auth provider validating credentials by calling a command."""
+
+    DEFAULT_TITLE = "Command Line Authentication"
+
+    # which keys to accept from a program's stdout
+    ALLOWED_META_KEYS = ("name",)
+
+    def __init__(self, *args: Any, **kwargs: Any) -> None:
+        """Extend parent's __init__.
+
+        Adds self._user_meta dictionary to hold the user-specific
+        attributes provided by external programs.
+        """
+        super().__init__(*args, **kwargs)
+        self._user_meta = {}  # type: Dict[str, Dict[str, Any]]
+
+    async def async_login_flow(self, context: Optional[dict]) -> LoginFlow:
+        """Return a flow to login."""
+        return CommandLineLoginFlow(self)
+
+    async def async_validate_login(self, username: str, password: str) -> None:
+        """Validate a username and password."""
+        env = {
+            "username": username,
+            "password": password,
+        }
+        try:
+            # pylint: disable=no-member
+            process = await asyncio.subprocess.create_subprocess_exec(
+                self.config[CONF_COMMAND], *self.config[CONF_ARGS],
+                env=env,
+                stdout=asyncio.subprocess.PIPE
+                if self.config[CONF_META] else None,
+            )
+            stdout, _ = (await process.communicate())
+        except OSError as err:
+            # happens when command doesn't exist or permission is denied
+            _LOGGER.error("Error while authenticating %r: %s",
+                          username, err)
+            raise InvalidAuthError
+
+        if process.returncode != 0:
+            _LOGGER.error("User %r failed to authenticate, command exited "
+                          "with code %d.",
+                          username, process.returncode)
+            raise InvalidAuthError
+
+        if self.config[CONF_META]:
+            meta = {}  # type: Dict[str, str]
+            for _line in stdout.splitlines():
+                try:
+                    line = _line.decode().lstrip()
+                    if line.startswith("#"):
+                        continue
+                    key, value = line.split("=", 1)
+                except ValueError:
+                    # malformed line
+                    continue
+                key = key.strip()
+                value = value.strip()
+                if key in self.ALLOWED_META_KEYS:
+                    meta[key] = value
+            self._user_meta[username] = meta
+
+    async def async_get_or_create_credentials(
+            self, flow_result: Dict[str, str]
+    ) -> Credentials:
+        """Get credentials based on the flow result."""
+        username = flow_result["username"]
+        for credential in await self.async_credentials():
+            if credential.data["username"] == username:
+                return credential
+
+        # Create new credentials.
+        return self.async_create_credentials({
+            "username": username,
+        })
+
+    async def async_user_meta_for_credentials(
+            self, credentials: Credentials
+    ) -> UserMeta:
+        """Return extra user metadata for credentials.
+
+        Currently, only name is supported.
+        """
+        meta = self._user_meta.get(credentials.data["username"], {})
+        return UserMeta(
+            name=meta.get("name"),
+            is_active=True,
+        )
+
+
+class CommandLineLoginFlow(LoginFlow):
+    """Handler for the login flow."""
+
+    async def async_step_init(
+            self, user_input: Optional[Dict[str, str]] = None
+    ) -> Dict[str, Any]:
+        """Handle the step of the form."""
+        errors = {}
+
+        if user_input is not None:
+            user_input["username"] = user_input["username"].strip()
+            try:
+                await cast(CommandLineAuthProvider, self._auth_provider) \
+                        .async_validate_login(
+                            user_input["username"], user_input["password"]
+                        )
+            except InvalidAuthError:
+                errors["base"] = "invalid_auth"
+
+            if not errors:
+                user_input.pop("password")
+                return await self.async_finish(user_input)
+
+        schema = collections.OrderedDict()  # type: Dict[str, type]
+        schema["username"] = str
+        schema["password"] = str
+
+        return self.async_show_form(
+            step_id="init",
+            data_schema=vol.Schema(schema),
+            errors=errors,
+        )

homeassistant/auth/providers/homeassistant.py

@@ -1,9 +1,10 @@
 """Home Assistant auth provider."""
+import asyncio
 import base64
 from collections import OrderedDict
-import hashlib
-import hmac
-from typing import Any, Dict, List, Optional, cast
+import logging
+
+from typing import Any, Dict, List, Optional, Set, cast  # noqa: F401
 
 import bcrypt
 import voluptuous as vol
@@ -11,12 +12,10 @@ import voluptuous as vol
 from homeassistant.const import CONF_ID
 from homeassistant.core import callback, HomeAssistant
 from homeassistant.exceptions import HomeAssistantError
-from homeassistant.util.async_ import run_coroutine_threadsafe
 
 from . import AuthProvider, AUTH_PROVIDER_SCHEMA, AUTH_PROVIDERS, LoginFlow
 
 from ..models import Credentials, UserMeta
-from ..util import generate_secret
 
 
 STORAGE_VERSION = 1
@@ -52,8 +51,21 @@ class Data:
     def __init__(self, hass: HomeAssistant) -> None:
         """Initialize the user data store."""
         self.hass = hass
-        self._store = hass.helpers.storage.Store(STORAGE_VERSION, STORAGE_KEY)
+        self._store = hass.helpers.storage.Store(STORAGE_VERSION, STORAGE_KEY,
+                                                 private=True)
         self._data = None  # type: Optional[Dict[str, Any]]
+        # Legacy mode will allow usernames to start/end with whitespace
+        # and will compare usernames case-insensitive.
+        # Remove in 2020 or when we launch 1.0.
+        self.is_legacy = False
+
+    @callback
+    def normalize_username(self, username: str) -> str:
+        """Normalize a username based on the mode."""
+        if self.is_legacy:
+            return username
+
+        return username.strip().casefold()
 
     async def async_load(self) -> None:
         """Load stored data."""
@@ -61,10 +73,40 @@ class Data:
 
         if data is None:
             data = {
-                'salt': generate_secret(),
                 'users': []
             }
 
+        seen = set()  # type: Set[str]
+
+        for user in data['users']:
+            username = user['username']
+
+            # check if we have duplicates
+            folded = username.casefold()
+
+            if folded in seen:
+                self.is_legacy = True
+
+                logging.getLogger(__name__).warning(
+                    "Home Assistant auth provider is running in legacy mode "
+                    "because we detected usernames that are case-insensitive"
+                    "equivalent. Please change the username: '%s'.", username)
+
+                break
+
+            seen.add(folded)
+
+            # check if we have unstripped usernames
+            if username != username.strip():
+                self.is_legacy = True
+
+                logging.getLogger(__name__).warning(
+                    "Home Assistant auth provider is running in legacy mode "
+                    "because we detected usernames that start or end in a "
+                    "space. Please change the username: '%s'.", username)
+
+                break
+
         self._data = data
 
     @property
@@ -77,12 +119,13 @@ class Data:
 
         Raises InvalidAuth if auth invalid.
         """
+        username = self.normalize_username(username)
         dummy = b'$2b$12$CiuFGszHx9eNHxPuQcwBWez4CwDTOcLTX5CbOpV6gef2nYuXkY7BO'
         found = None
 
         # Compare all users to avoid timing attacks.
         for user in self.users:
-            if username == user['username']:
+            if self.normalize_username(user['username']) == username:
                 found = user
 
         if found is None:
@@ -93,39 +136,11 @@ class Data:
 
         user_hash = base64.b64decode(found['password'])
 
-        # if the hash is not a bcrypt hash...
-        # provide a transparant upgrade for old pbkdf2 hash format
-        if not (user_hash.startswith(b'$2a$')
-                or user_hash.startswith(b'$2b$')
-                or user_hash.startswith(b'$2x$')
-                or user_hash.startswith(b'$2y$')):
-            # IMPORTANT! validate the login, bail if invalid
-            hashed = self.legacy_hash_password(password)
-            if not hmac.compare_digest(hashed, user_hash):
-                raise InvalidAuth
-            # then re-hash the valid password with bcrypt
-            self.change_password(found['username'], password)
-            run_coroutine_threadsafe(
-                self.async_save(), self.hass.loop
-            ).result()
-            user_hash = base64.b64decode(found['password'])
-
         # bcrypt.checkpw is timing-safe
         if not bcrypt.checkpw(password.encode(),
                               user_hash):
             raise InvalidAuth
 
-    def legacy_hash_password(self, password: str,
-                             for_storage: bool = False) -> bytes:
-        """LEGACY password encoding."""
-        # We're no longer storing salts in data, but if one exists we
-        # should be able to retrieve it.
-        salt = self._data['salt'].encode()  # type: ignore
-        hashed = hashlib.pbkdf2_hmac('sha512', password.encode(), salt, 100000)
-        if for_storage:
-            hashed = base64.b64encode(hashed)
-        return hashed
-
     # pylint: disable=no-self-use
     def hash_password(self, password: str, for_storage: bool = False) -> bytes:
         """Encode a password."""
@@ -137,7 +152,10 @@ class Data:
 
     def add_auth(self, username: str, password: str) -> None:
         """Add a new authenticated user/pass."""
-        if any(user['username'] == username for user in self.users):
+        username = self.normalize_username(username)
+
+        if any(self.normalize_username(user['username']) == username
+               for user in self.users):
             raise InvalidUser
 
         self.users.append({
@@ -148,9 +166,11 @@ class Data:
     @callback
     def async_remove_auth(self, username: str) -> None:
         """Remove authentication."""
+        username = self.normalize_username(username)
+
         index = None
         for i, user in enumerate(self.users):
-            if user['username'] == username:
+            if self.normalize_username(user['username']) == username:
                 index = i
                 break
 
@@ -164,8 +184,10 @@ class Data:
 
         Raises InvalidUser if user cannot be found.
         """
+        username = self.normalize_username(username)
+
         for user in self.users:
-            if user['username'] == username:
+            if self.normalize_username(user['username']) == username:
                 user['password'] = self.hash_password(
                     new_password, True).decode()
                 break
@@ -183,15 +205,21 @@ class HassAuthProvider(AuthProvider):
 
     DEFAULT_TITLE = 'Home Assistant Local'
 
-    data = None
+    def __init__(self, *args: Any, **kwargs: Any) -> None:
+        """Initialize an Home Assistant auth provider."""
+        super().__init__(*args, **kwargs)
+        self.data = None  # type: Optional[Data]
+        self._init_lock = asyncio.Lock()
 
     async def async_initialize(self) -> None:
         """Initialize the auth provider."""
-        if self.data is not None:
-            return
+        async with self._init_lock:
+            if self.data is not None:
+                return
 
-        self.data = Data(self.hass)
-        await self.data.async_load()
+            data = Data(self.hass)
+            await data.async_load()
+            self.data = data
 
     async def async_login_flow(
             self, context: Optional[Dict]) -> LoginFlow:
@@ -210,10 +238,15 @@ class HassAuthProvider(AuthProvider):
     async def async_get_or_create_credentials(
             self, flow_result: Dict[str, str]) -> Credentials:
         """Get credentials based on the flow result."""
-        username = flow_result['username']
+        if self.data is None:
+            await self.async_initialize()
+            assert self.data is not None
+
+        norm_username = self.data.normalize_username
+        username = norm_username(flow_result['username'])
 
         for credential in await self.async_credentials():
-            if credential.data['username'] == username:
+            if norm_username(credential.data['username']) == username:
                 return credential
 
         # Create new credentials.

homeassistant/auth/providers/legacy_api_password.py

@@ -8,20 +8,19 @@ from typing import Any, Dict, Optional, cast
 
 import voluptuous as vol
 
-from homeassistant.components.http import HomeAssistantHTTP  # noqa: F401
-from homeassistant.core import callback
+from homeassistant.core import HomeAssistant, callback
 from homeassistant.exceptions import HomeAssistantError
+import homeassistant.helpers.config_validation as cv
 
 from . import AuthProvider, AUTH_PROVIDER_SCHEMA, AUTH_PROVIDERS, LoginFlow
-from ..models import Credentials, UserMeta
-
-
-USER_SCHEMA = vol.Schema({
-    vol.Required('username'): str,
-})
+from .. import AuthManager
+from ..models import Credentials, UserMeta, User
 
+AUTH_PROVIDER_TYPE = 'legacy_api_password'
+CONF_API_PASSWORD = 'api_password'
 
 CONFIG_SCHEMA = AUTH_PROVIDER_SCHEMA.extend({
+    vol.Required(CONF_API_PASSWORD): cv.string,
 }, extra=vol.PREVENT_EXTRA)
 
 LEGACY_USER_NAME = 'Legacy API password user'
@@ -31,22 +30,45 @@ class InvalidAuthError(HomeAssistantError):
     """Raised when submitting invalid authentication."""
 
 
-@AUTH_PROVIDERS.register('legacy_api_password')
+async def async_validate_password(hass: HomeAssistant, password: str)\
+        -> Optional[User]:
+    """Return a user if password is valid. None if not."""
+    auth = cast(AuthManager, hass.auth)  # type: ignore
+    providers = auth.get_auth_providers(AUTH_PROVIDER_TYPE)
+    if not providers:
+        raise ValueError('Legacy API password provider not found')
+
+    try:
+        provider = cast(LegacyApiPasswordAuthProvider, providers[0])
+        provider.async_validate_login(password)
+        return await auth.async_get_or_create_user(
+            await provider.async_get_or_create_credentials({})
+        )
+    except InvalidAuthError:
+        return None
+
+
+@AUTH_PROVIDERS.register(AUTH_PROVIDER_TYPE)
 class LegacyApiPasswordAuthProvider(AuthProvider):
-    """Example auth provider based on hardcoded usernames and passwords."""
+    """An auth provider support legacy api_password."""
 
     DEFAULT_TITLE = 'Legacy API Password'
 
+    @property
+    def api_password(self) -> str:
+        """Return api_password."""
+        return str(self.config[CONF_API_PASSWORD])
+
     async def async_login_flow(self, context: Optional[Dict]) -> LoginFlow:
         """Return a flow to login."""
         return LegacyLoginFlow(self)
 
     @callback
     def async_validate_login(self, password: str) -> None:
-        """Validate a username and password."""
-        hass_http = getattr(self.hass, 'http', None)  # type: HomeAssistantHTTP
+        """Validate password."""
+        api_password = str(self.config[CONF_API_PASSWORD])
 
-        if not hmac.compare_digest(hass_http.api_password.encode('utf-8'),
+        if not hmac.compare_digest(api_password.encode('utf-8'),
                                    password.encode('utf-8')):
             raise InvalidAuthError
 
@@ -78,12 +100,6 @@ class LegacyLoginFlow(LoginFlow):
         """Handle the step of the form."""
         errors = {}
 
-        hass_http = getattr(self.hass, 'http', None)
-        if hass_http is None or not hass_http.api_password:
-            return self.async_abort(
-                reason='no_api_password_set'
-            )
-
         if user_input is not None:
             try:
                 cast(LegacyApiPasswordAuthProvider, self._auth_provider)\

homeassistant/auth/providers/trusted_networks.py

@@ -3,18 +3,41 @@
 It shows list of users if access from trusted network.
 Abort login flow if not access from trusted network.
 """
-from typing import Any, Dict, Optional, cast
+from ipaddress import ip_network, IPv4Address, IPv6Address, IPv4Network,\
+    IPv6Network
+from typing import Any, Dict, List, Optional, Union, cast
 
 import voluptuous as vol
 
-from homeassistant.components.http import HomeAssistantHTTP  # noqa: F401
+import homeassistant.helpers.config_validation as cv
 from homeassistant.core import callback
 from homeassistant.exceptions import HomeAssistantError
-
 from . import AuthProvider, AUTH_PROVIDER_SCHEMA, AUTH_PROVIDERS, LoginFlow
 from ..models import Credentials, UserMeta
 
+IPAddress = Union[IPv4Address, IPv6Address]
+IPNetwork = Union[IPv4Network, IPv6Network]
+
+CONF_TRUSTED_NETWORKS = 'trusted_networks'
+CONF_TRUSTED_USERS = 'trusted_users'
+CONF_GROUP = 'group'
+CONF_ALLOW_BYPASS_LOGIN = 'allow_bypass_login'
+
 CONFIG_SCHEMA = AUTH_PROVIDER_SCHEMA.extend({
+    vol.Required(CONF_TRUSTED_NETWORKS): vol.All(
+        cv.ensure_list, [ip_network]
+    ),
+    vol.Optional(CONF_TRUSTED_USERS, default={}): vol.Schema(
+        # we only validate the format of user_id or group_id
+        {ip_network: vol.All(
+            cv.ensure_list,
+            [vol.Or(
+                cv.uuid4_hex,
+                vol.Schema({vol.Required(CONF_GROUP): cv.uuid4_hex}),
+            )],
+        )}
+    ),
+    vol.Optional(CONF_ALLOW_BYPASS_LOGIN, default=False): cv.boolean,
 }, extra=vol.PREVENT_EXTRA)
 
 
@@ -35,6 +58,16 @@ class TrustedNetworksAuthProvider(AuthProvider):
 
     DEFAULT_TITLE = 'Trusted Networks'
 
+    @property
+    def trusted_networks(self) -> List[IPNetwork]:
+        """Return trusted networks."""
+        return cast(List[IPNetwork], self.config[CONF_TRUSTED_NETWORKS])
+
+    @property
+    def trusted_users(self) -> Dict[IPNetwork, Any]:
+        """Return trusted users per network."""
+        return cast(Dict[IPNetwork, Any], self.config[CONF_TRUSTED_USERS])
+
     @property
     def support_mfa(self) -> bool:
         """Trusted Networks auth provider does not support MFA."""
@@ -43,13 +76,34 @@ class TrustedNetworksAuthProvider(AuthProvider):
     async def async_login_flow(self, context: Optional[Dict]) -> LoginFlow:
         """Return a flow to login."""
         assert context is not None
+        ip_addr = cast(IPAddress, context.get('ip_address'))
         users = await self.store.async_get_users()
-        available_users = {user.id: user.name
-                           for user in users
-                           if not user.system_generated and user.is_active}
+        available_users = [user for user in users
+                           if not user.system_generated and user.is_active]
+        for ip_net, user_or_group_list in self.trusted_users.items():
+            if ip_addr in ip_net:
+                user_list = [user_id for user_id in user_or_group_list
+                             if isinstance(user_id, str)]
+                group_list = [group[CONF_GROUP] for group in user_or_group_list
+                              if isinstance(group, dict)]
+                flattened_group_list = [group for sublist in group_list
+                                        for group in sublist]
+                available_users = [
+                    user for user in available_users
+                    if (user.id in user_list or
+                        any([group.id in flattened_group_list
+                             for group in user.groups]))
+                ]
+                break
 
         return TrustedNetworksLoginFlow(
-            self, cast(str, context.get('ip_address')), available_users)
+            self,
+            ip_addr,
+            {
+                user.id: user.name for user in available_users
+            },
+            self.config[CONF_ALLOW_BYPASS_LOGIN],
+        )
 
     async def async_get_or_create_credentials(
             self, flow_result: Dict[str, str]) -> Credentials:
@@ -80,19 +134,17 @@ class TrustedNetworksAuthProvider(AuthProvider):
         raise NotImplementedError
 
     @callback
-    def async_validate_access(self, ip_address: str) -> None:
+    def async_validate_access(self, ip_addr: IPAddress) -> None:
         """Make sure the access from trusted networks.
 
         Raise InvalidAuthError if not.
         Raise InvalidAuthError if trusted_networks is not configured.
         """
-        hass_http = getattr(self.hass, 'http', None)  # type: HomeAssistantHTTP
-
-        if not hass_http or not hass_http.trusted_networks:
+        if not self.trusted_networks:
             raise InvalidAuthError('trusted_networks is not configured')
 
-        if not any(ip_address in trusted_network for trusted_network
-                   in hass_http.trusted_networks):
+        if not any(ip_addr in trusted_network for trusted_network
+                   in self.trusted_networks):
             raise InvalidAuthError('Not in trusted_networks')
 
 
@@ -100,12 +152,14 @@ class TrustedNetworksLoginFlow(LoginFlow):
     """Handler for the login flow."""
 
     def __init__(self, auth_provider: TrustedNetworksAuthProvider,
-                 ip_address: str, available_users: Dict[str, Optional[str]]) \
-            -> None:
+                 ip_addr: IPAddress,
+                 available_users: Dict[str, Optional[str]],
+                 allow_bypass_login: bool) -> None:
         """Initialize the login flow."""
         super().__init__(auth_provider)
         self._available_users = available_users
-        self._ip_address = ip_address
+        self._ip_address = ip_addr
+        self._allow_bypass_login = allow_bypass_login
 
     async def async_step_init(
             self, user_input: Optional[Dict[str, str]] = None) \
@@ -123,6 +177,11 @@ class TrustedNetworksLoginFlow(LoginFlow):
         if user_input is not None:
             return await self.async_finish(user_input)
 
+        if self._allow_bypass_login and len(self._available_users) == 1:
+            return await self.async_finish({
+                'user': next(iter(self._available_users.keys()))
+            })
+
         return self.async_show_form(
             step_id='init',
             data_schema=vol.Schema({'user': vol.In(self._available_users)}),

homeassistant/bootstrap.py

@@ -1,25 +1,23 @@
 """Provide methods to bootstrap a Home Assistant instance."""
+import asyncio
 import logging
 import logging.handlers
 import os
 import sys
 from time import time
 from collections import OrderedDict
-
-from typing import Any, Optional, Dict
+from typing import Any, Optional, Dict, Set
 
 import voluptuous as vol
 
-from homeassistant import (
-    core, config as conf_util, config_entries, components as core_components)
-from homeassistant.components import persistent_notification
+from homeassistant import core, config as conf_util, config_entries, loader
 from homeassistant.const import EVENT_HOMEASSISTANT_CLOSE
 from homeassistant.setup import async_setup_component
 from homeassistant.util.logging import AsyncHandler
 from homeassistant.util.package import async_get_user_site, is_virtual_env
 from homeassistant.util.yaml import clear_secret_cache
 from homeassistant.exceptions import HomeAssistantError
-from homeassistant.helpers.signal import async_register_signal_handling
+from homeassistant.helpers import config_validation as cv
 
 _LOGGER = logging.getLogger(__name__)
 
@@ -28,40 +26,15 @@ ERROR_LOG_FILENAME = 'home-assistant.log'
 # hass.data key for logging information.
 DATA_LOGGING = 'logging'
 
-FIRST_INIT_COMPONENT = {'system_log', 'recorder', 'mqtt', 'mqtt_eventstream',
-                        'logger', 'introduction', 'frontend', 'history'}
-
-
-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,
-                     log_file: Any = None,
-                     log_no_color: bool = False) \
-                     -> Optional[core.HomeAssistant]:
-    """Try to configure Home Assistant from a configuration dictionary.
-
-    Dynamically loads required components and its dependencies.
-    """
-    if hass is None:
-        hass = core.HomeAssistant()
-        if config_dir is not None:
-            config_dir = os.path.abspath(config_dir)
-            hass.config.config_dir = config_dir
-            if not is_virtual_env():
-                hass.loop.run_until_complete(
-                    async_mount_local_lib_path(config_dir))
-
-    # run task
-    hass = hass.loop.run_until_complete(
-        async_from_config_dict(
-            config, hass, config_dir, enable_log, verbose, skip_pip,
-            log_rotate_days, log_file, log_no_color)
-    )
-    return hass
+DEBUGGER_INTEGRATIONS = {'ptvsd', }
+CORE_INTEGRATIONS = ('homeassistant', 'persistent_notification')
+LOGGING_INTEGRATIONS = {'logger', 'system_log'}
+STAGE_1_INTEGRATIONS = {
+    # To record data
+    'recorder',
+    # To make sure we forward data to other instances
+    'mqtt_eventstream',
+}
 
 
 async def async_from_config_dict(config: Dict[str, Any],
@@ -85,14 +58,18 @@ async def async_from_config_dict(config: Dict[str, Any],
         async_enable_logging(hass, verbose, log_rotate_days, log_file,
                              log_no_color)
 
+    hass.config.skip_pip = skip_pip
+    if skip_pip:
+        _LOGGER.warning("Skipping pip installation of required modules. "
+                        "This may cause issues")
+
     core_config = config.get(core.DOMAIN, {})
-    has_api_password = bool((config.get('http') or {}).get('api_password'))
-    has_trusted_networks = bool((config.get('http') or {})
-                                .get('trusted_networks'))
+    api_password = config.get('http', {}).get('api_password')
+    trusted_networks = config.get('http', {}).get('trusted_networks')
 
     try:
         await conf_util.async_process_ha_core_config(
-            hass, core_config, has_api_password, has_trusted_networks)
+            hass, core_config, api_password, trusted_networks)
     except vol.Invalid as config_err:
         conf_util.async_log_exception(
             config_err, 'homeassistant', core_config, hass)
@@ -102,90 +79,65 @@ async def async_from_config_dict(config: Dict[str, Any],
                       "Further initialization aborted")
         return None
 
-    await hass.async_add_executor_job(
-        conf_util.process_ha_config_upgrade, hass)
-
-    hass.config.skip_pip = skip_pip
-    if skip_pip:
-        _LOGGER.warning("Skipping pip installation of required modules. "
-                        "This may cause issues")
-
     # Make a copy because we are mutating it.
     config = OrderedDict(config)
 
     # Merge packages
-    conf_util.merge_packages_config(
+    await conf_util.merge_packages_config(
         hass, config, core_config.get(conf_util.CONF_PACKAGES, {}))
 
-    # Ensure we have no None values after merge
-    for key, value in config.items():
-        if not value:
-            config[key] = {}
-
     hass.config_entries = config_entries.ConfigEntries(hass, config)
-    await hass.config_entries.async_load()
+    await hass.config_entries.async_initialize()
 
-    # Filter out the repeating and common config section [homeassistant]
-    components = set(key.split(' ')[0] for key in config.keys()
-                     if key != core.DOMAIN)
-    components.update(hass.config_entries.async_domains())
-
-    # setup components
-    res = await core_components.async_setup(hass, config)
-    if not res:
-        _LOGGER.error("Home Assistant core failed to initialize. "
-                      "Further initialization aborted")
-        return hass
-
-    await persistent_notification.async_setup(hass, config)
-
-    _LOGGER.info("Home Assistant core initialized")
-
-    # stage 1
-    for component in components:
-        if component not in FIRST_INIT_COMPONENT:
-            continue
-        hass.async_create_task(async_setup_component(hass, component, config))
-
-    await hass.async_block_till_done()
-
-    # stage 2
-    for component in components:
-        if component in FIRST_INIT_COMPONENT:
-            continue
-        hass.async_create_task(async_setup_component(hass, component, config))
-
-    await hass.async_block_till_done()
+    await _async_set_up_integrations(hass, config)
 
     stop = time()
     _LOGGER.info("Home Assistant initialized in %.2fs", stop-start)
 
-    async_register_signal_handling(hass)
-    return hass
+    # TEMP: warn users for invalid slugs
+    # Remove after 0.94 or 1.0
+    if cv.INVALID_SLUGS_FOUND or cv.INVALID_ENTITY_IDS_FOUND:
+        msg = []
 
+        if cv.INVALID_ENTITY_IDS_FOUND:
+            msg.append(
+                "Your configuration contains invalid entity ID references. "
+                "Please find and update the following. "
+                "This will become a breaking change."
+            )
+            msg.append('\n'.join('- {} -> {}'.format(*item)
+                                 for item
+                                 in cv.INVALID_ENTITY_IDS_FOUND.items()))
 
-def from_config_file(config_path: str,
-                     hass: Optional[core.HomeAssistant] = None,
-                     verbose: bool = False,
-                     skip_pip: bool = True,
-                     log_rotate_days: Any = None,
-                     log_file: Any = None,
-                     log_no_color: bool = False)\
-        -> Optional[core.HomeAssistant]:
-    """Read the configuration file and try to start all the functionality.
+        if cv.INVALID_SLUGS_FOUND:
+            msg.append(
+                "Your configuration contains invalid slugs. "
+                "Please find and update the following. "
+                "This will become a breaking change."
+            )
+            msg.append('\n'.join('- {} -> {}'.format(*item)
+                                 for item in cv.INVALID_SLUGS_FOUND.items()))
 
-    Will add functionality to 'hass' parameter if given,
-    instantiates a new Home Assistant object if 'hass' is not given.
-    """
-    if hass is None:
-        hass = core.HomeAssistant()
+        hass.components.persistent_notification.async_create(
+            '\n\n'.join(msg), "Config Warning", "config_warning"
+        )
 
-    # run task
-    hass = hass.loop.run_until_complete(
-        async_from_config_file(
-            config_path, hass, verbose, skip_pip,
-            log_rotate_days, log_file, log_no_color)
-    )
+    # TEMP: warn users of invalid extra keys
+    # Remove after 0.92
+    if cv.INVALID_EXTRA_KEYS_FOUND:
+        msg = []
+        msg.append(
+            "Your configuration contains extra keys "
+            "that the platform does not support (but were silently "
+            "accepted before 0.88). Please find and remove the following."
+            "This will become a breaking change."
+        )
+        msg.append('\n'.join('- {}'.format(it)
+                             for it in cv.INVALID_EXTRA_KEYS_FOUND))
+
+        hass.components.persistent_notification.async_create(
+            '\n\n'.join(msg), "Config Warning", "config_warning"
+        )
 
     return hass
 
@@ -213,6 +165,9 @@ async def async_from_config_file(config_path: str,
     async_enable_logging(hass, verbose, log_rotate_days, log_file,
                          log_no_color)
 
+    await hass.async_add_executor_job(
+        conf_util.process_ha_config_upgrade, hass)
+
     try:
         config_dict = await hass.async_add_executor_job(
             conf_util.load_yaml_config_file, config_path)
@@ -328,3 +283,139 @@ async def async_mount_local_lib_path(config_dir: str) -> str:
     if lib_dir not in sys.path:
         sys.path.insert(0, lib_dir)
     return deps_dir
+
+
+@core.callback
+def _get_domains(hass: core.HomeAssistant, config: Dict[str, Any]) -> Set[str]:
+    """Get domains of components to set up."""
+    # Filter out the repeating and common config section [homeassistant]
+    domains = set(key.split(' ')[0] for key in config.keys()
+                  if key != core.DOMAIN)
+
+    # Add config entry domains
+    domains.update(hass.config_entries.async_domains())  # type: ignore
+
+    # Make sure the Hass.io component is loaded
+    if 'HASSIO' in os.environ:
+        domains.add('hassio')
+
+    return domains
+
+
+async def _async_set_up_integrations(
+        hass: core.HomeAssistant, config: Dict[str, Any]) -> None:
+    """Set up all the integrations."""
+    domains = _get_domains(hass, config)
+
+    # Start up debuggers. Start these first in case they want to wait.
+    debuggers = domains & DEBUGGER_INTEGRATIONS
+    if debuggers:
+        _LOGGER.debug("Starting up debuggers %s", debuggers)
+        await asyncio.gather(*[
+            async_setup_component(hass, domain, config)
+            for domain in debuggers])
+        domains -= DEBUGGER_INTEGRATIONS
+
+    # Resolve all dependencies of all components so we can find the logging
+    # and integrations that need faster initialization.
+    resolved_domains_task = asyncio.gather(*[
+        loader.async_component_dependencies(hass, domain)
+        for domain in domains
+    ], return_exceptions=True)
+
+    # Set up core.
+    _LOGGER.debug("Setting up %s", CORE_INTEGRATIONS)
+
+    if not all(await asyncio.gather(*[
+            async_setup_component(hass, domain, config)
+            for domain in CORE_INTEGRATIONS
+    ])):
+        _LOGGER.error("Home Assistant core failed to initialize. "
+                      "Further initialization aborted")
+        return
+
+    _LOGGER.debug("Home Assistant core initialized")
+
+    # Finish resolving domains
+    for dep_domains in await resolved_domains_task:
+        # Result is either a set or an exception. We ignore exceptions
+        # It will be properly handled during setup of the domain.
+        if isinstance(dep_domains, set):
+            domains.update(dep_domains)
+
+    # setup components
+    logging_domains = domains & LOGGING_INTEGRATIONS
+    stage_1_domains = domains & STAGE_1_INTEGRATIONS
+    stage_2_domains = domains - logging_domains - stage_1_domains
+
+    if logging_domains:
+        _LOGGER.info("Setting up %s", logging_domains)
+
+        await asyncio.gather(*[
+            async_setup_component(hass, domain, config)
+            for domain in logging_domains
+        ])
+
+    # Kick off loading the registries. They don't need to be awaited.
+    asyncio.gather(
+        hass.helpers.device_registry.async_get_registry(),
+        hass.helpers.entity_registry.async_get_registry(),
+        hass.helpers.area_registry.async_get_registry())
+
+    if stage_1_domains:
+        await asyncio.gather(*[
+            async_setup_component(hass, domain, config)
+            for domain in stage_1_domains
+        ])
+
+    # Load all integrations
+    after_dependencies = {}  # type: Dict[str, Set[str]]
+
+    for int_or_exc in await asyncio.gather(*[
+            loader.async_get_integration(hass, domain)
+            for domain in stage_2_domains
+    ], return_exceptions=True):
+        # Exceptions are handled in async_setup_component.
+        if (isinstance(int_or_exc, loader.Integration) and
+                int_or_exc.after_dependencies):
+            after_dependencies[int_or_exc.domain] = set(
+                int_or_exc.after_dependencies
+            )
+
+    last_load = None
+    while stage_2_domains:
+        domains_to_load = set()
+
+        for domain in stage_2_domains:
+            after_deps = after_dependencies.get(domain)
+            # Load if integration has no after_dependencies or they are
+            # all loaded
+            if (not after_deps or
+                    not after_deps-hass.config.components):
+                domains_to_load.add(domain)
+
+        if not domains_to_load or domains_to_load == last_load:
+            break
+
+        _LOGGER.debug("Setting up %s", domains_to_load)
+
+        await asyncio.gather(*[
+            async_setup_component(hass, domain, config)
+            for domain in domains_to_load
+        ])
+
+        last_load = domains_to_load
+        stage_2_domains -= domains_to_load
+
+    # These are stage 2 domains that never have their after_dependencies
+    # satisfied.
+    if stage_2_domains:
+        _LOGGER.debug("Final set up: %s", stage_2_domains)
+
+        await asyncio.gather(*[
+            async_setup_component(hass, domain, config)
+            for domain in stage_2_domains
+        ])
+
+    # Wrap up startup
+    await hass.async_block_till_done()

homeassistant/components/__init__.py

@@ -7,26 +7,12 @@ Component design guidelines:
   format "<DOMAIN>.<OBJECT_ID>".
 - Each component should publish services only under its own domain.
 """
-import asyncio
-import itertools as it
 import logging
-from typing import Awaitable
 
-import homeassistant.core as ha
-import homeassistant.config as conf_util
-from homeassistant.exceptions import HomeAssistantError
-from homeassistant.helpers.service import extract_entity_ids
-from homeassistant.helpers import intent
-from homeassistant.const import (
-    ATTR_ENTITY_ID, SERVICE_TURN_ON, SERVICE_TURN_OFF, SERVICE_TOGGLE,
-    SERVICE_HOMEASSISTANT_STOP, SERVICE_HOMEASSISTANT_RESTART,
-    RESTART_EXIT_CODE)
+from homeassistant.core import split_entity_id
 
 _LOGGER = logging.getLogger(__name__)
 
-SERVICE_RELOAD_CORE_CONFIG = 'reload_core_config'
-SERVICE_CHECK_CONFIG = 'check_config'
-
 
 def is_on(hass, entity_id=None):
     """Load up the module to call the is_on method.
@@ -39,7 +25,7 @@ def is_on(hass, entity_id=None):
         entity_ids = hass.states.entity_ids()
 
     for ent_id in entity_ids:
-        domain = ha.split_entity_id(ent_id)[0]
+        domain = split_entity_id(ent_id)[0]
 
         try:
             component = getattr(hass.components, domain)
@@ -57,155 +43,3 @@ def is_on(hass, entity_id=None):
             return True
 
     return False
-
-
-def turn_on(hass, entity_id=None, **service_data):
-    """Turn specified entity on if possible."""
-    if entity_id is not None:
-        service_data[ATTR_ENTITY_ID] = entity_id
-
-    hass.services.call(ha.DOMAIN, SERVICE_TURN_ON, service_data)
-
-
-def turn_off(hass, entity_id=None, **service_data):
-    """Turn specified entity off."""
-    if entity_id is not None:
-        service_data[ATTR_ENTITY_ID] = entity_id
-
-    hass.services.call(ha.DOMAIN, SERVICE_TURN_OFF, service_data)
-
-
-def toggle(hass, entity_id=None, **service_data):
-    """Toggle specified entity."""
-    if entity_id is not None:
-        service_data[ATTR_ENTITY_ID] = entity_id
-
-    hass.services.call(ha.DOMAIN, SERVICE_TOGGLE, service_data)
-
-
-def stop(hass):
-    """Stop Home Assistant."""
-    hass.services.call(ha.DOMAIN, SERVICE_HOMEASSISTANT_STOP)
-
-
-def restart(hass):
-    """Stop Home Assistant."""
-    hass.services.call(ha.DOMAIN, SERVICE_HOMEASSISTANT_RESTART)
-
-
-def check_config(hass):
-    """Check the config files."""
-    hass.services.call(ha.DOMAIN, SERVICE_CHECK_CONFIG)
-
-
-def reload_core_config(hass):
-    """Reload the core config."""
-    hass.services.call(ha.DOMAIN, SERVICE_RELOAD_CORE_CONFIG)
-
-
-@asyncio.coroutine
-def async_reload_core_config(hass):
-    """Reload the core config."""
-    yield from hass.services.async_call(ha.DOMAIN, SERVICE_RELOAD_CORE_CONFIG)
-
-
-@asyncio.coroutine
-def async_setup(hass: ha.HomeAssistant, config: dict) -> Awaitable[bool]:
-    """Set up general services related to Home Assistant."""
-    @asyncio.coroutine
-    def async_handle_turn_service(service):
-        """Handle calls to homeassistant.turn_on/off."""
-        entity_ids = extract_entity_ids(hass, service)
-
-        # Generic turn on/off method requires entity id
-        if not entity_ids:
-            _LOGGER.error(
-                "homeassistant/%s cannot be called without entity_id",
-                service.service)
-            return
-
-        # Group entity_ids by domain. groupby requires sorted data.
-        by_domain = it.groupby(sorted(entity_ids),
-                               lambda item: ha.split_entity_id(item)[0])
-
-        tasks = []
-
-        for domain, ent_ids in by_domain:
-            # We want to block for all calls and only return when all calls
-            # have been processed. If a service does not exist it causes a 10
-            # second delay while we're blocking waiting for a response.
-            # But services can be registered on other HA instances that are
-            # listening to the bus too. So as an in between solution, we'll
-            # block only if the service is defined in the current HA instance.
-            blocking = hass.services.has_service(domain, service.service)
-
-            # Create a new dict for this call
-            data = dict(service.data)
-
-            # ent_ids is a generator, convert it to a list.
-            data[ATTR_ENTITY_ID] = list(ent_ids)
-
-            tasks.append(hass.services.async_call(
-                domain, service.service, data, blocking))
-
-        yield from asyncio.wait(tasks, loop=hass.loop)
-
-    hass.services.async_register(
-        ha.DOMAIN, SERVICE_TURN_OFF, async_handle_turn_service)
-    hass.services.async_register(
-        ha.DOMAIN, SERVICE_TURN_ON, async_handle_turn_service)
-    hass.services.async_register(
-        ha.DOMAIN, SERVICE_TOGGLE, async_handle_turn_service)
-    hass.helpers.intent.async_register(intent.ServiceIntentHandler(
-        intent.INTENT_TURN_ON, ha.DOMAIN, SERVICE_TURN_ON, "Turned {} on"))
-    hass.helpers.intent.async_register(intent.ServiceIntentHandler(
-        intent.INTENT_TURN_OFF, ha.DOMAIN, SERVICE_TURN_OFF,
-        "Turned {} off"))
-    hass.helpers.intent.async_register(intent.ServiceIntentHandler(
-        intent.INTENT_TOGGLE, ha.DOMAIN, SERVICE_TOGGLE, "Toggled {}"))
-
-    @asyncio.coroutine
-    def async_handle_core_service(call):
-        """Service handler for handling core services."""
-        if call.service == SERVICE_HOMEASSISTANT_STOP:
-            hass.async_create_task(hass.async_stop())
-            return
-
-        try:
-            errors = yield from conf_util.async_check_ha_config_file(hass)
-        except HomeAssistantError:
-            return
-
-        if errors:
-            _LOGGER.error(errors)
-            hass.components.persistent_notification.async_create(
-                "Config error. See dev-info panel for details.",
-                "Config validating", "{0}.check_config".format(ha.DOMAIN))
-            return
-
-        if call.service == SERVICE_HOMEASSISTANT_RESTART:
-            hass.async_create_task(hass.async_stop(RESTART_EXIT_CODE))
-
-    hass.services.async_register(
-        ha.DOMAIN, SERVICE_HOMEASSISTANT_STOP, async_handle_core_service)
-    hass.services.async_register(
-        ha.DOMAIN, SERVICE_HOMEASSISTANT_RESTART, async_handle_core_service)
-    hass.services.async_register(
-        ha.DOMAIN, SERVICE_CHECK_CONFIG, async_handle_core_service)
-
-    @asyncio.coroutine
-    def async_handle_reload_config(call):
-        """Service handler for reloading core config."""
-        try:
-            conf = yield from conf_util.async_hass_config_yaml(hass)
-        except HomeAssistantError as err:
-            _LOGGER.error(err)
-            return
-
-        yield from conf_util.async_process_ha_core_config(
-            hass, conf.get(ha.DOMAIN) or {})
-
-    hass.services.async_register(
-        ha.DOMAIN, SERVICE_RELOAD_CORE_CONFIG, async_handle_reload_config)
-
-    return True

homeassistant/components/abode.py

@@ -1,347 +0,0 @@
-"""
-This component provides basic support for Abode Home Security system.
-
-For more details about this component, please refer to the documentation at
-https://home-assistant.io/components/abode/
-"""
-import asyncio
-import logging
-from functools import partial
-from requests.exceptions import HTTPError, ConnectTimeout
-
-import voluptuous as vol
-
-from homeassistant.const import (
-    ATTR_ATTRIBUTION, ATTR_DATE, ATTR_TIME, ATTR_ENTITY_ID, CONF_USERNAME,
-    CONF_PASSWORD, CONF_EXCLUDE, CONF_NAME, CONF_LIGHTS,
-    EVENT_HOMEASSISTANT_STOP, EVENT_HOMEASSISTANT_START)
-from homeassistant.helpers import config_validation as cv
-from homeassistant.helpers import discovery
-from homeassistant.helpers.entity import Entity
-
-REQUIREMENTS = ['abodepy==0.13.1']
-
-_LOGGER = logging.getLogger(__name__)
-
-CONF_ATTRIBUTION = "Data provided by goabode.com"
-CONF_POLLING = 'polling'
-
-DOMAIN = 'abode'
-DEFAULT_CACHEDB = './abodepy_cache.pickle'
-
-NOTIFICATION_ID = 'abode_notification'
-NOTIFICATION_TITLE = 'Abode Security Setup'
-
-EVENT_ABODE_ALARM = 'abode_alarm'
-EVENT_ABODE_ALARM_END = 'abode_alarm_end'
-EVENT_ABODE_AUTOMATION = 'abode_automation'
-EVENT_ABODE_FAULT = 'abode_panel_fault'
-EVENT_ABODE_RESTORE = 'abode_panel_restore'
-
-SERVICE_SETTINGS = 'change_setting'
-SERVICE_CAPTURE_IMAGE = 'capture_image'
-SERVICE_TRIGGER = 'trigger_quick_action'
-
-ATTR_DEVICE_ID = 'device_id'
-ATTR_DEVICE_NAME = 'device_name'
-ATTR_DEVICE_TYPE = 'device_type'
-ATTR_EVENT_CODE = 'event_code'
-ATTR_EVENT_NAME = 'event_name'
-ATTR_EVENT_TYPE = 'event_type'
-ATTR_EVENT_UTC = 'event_utc'
-ATTR_SETTING = 'setting'
-ATTR_USER_NAME = 'user_name'
-ATTR_VALUE = 'value'
-
-ABODE_DEVICE_ID_LIST_SCHEMA = vol.Schema([str])
-
-CONFIG_SCHEMA = vol.Schema({
-    DOMAIN: vol.Schema({
-        vol.Required(CONF_USERNAME): cv.string,
-        vol.Required(CONF_PASSWORD): cv.string,
-        vol.Optional(CONF_NAME): cv.string,
-        vol.Optional(CONF_POLLING, default=False): cv.boolean,
-        vol.Optional(CONF_EXCLUDE, default=[]): ABODE_DEVICE_ID_LIST_SCHEMA,
-        vol.Optional(CONF_LIGHTS, default=[]): ABODE_DEVICE_ID_LIST_SCHEMA
-    }),
-}, extra=vol.ALLOW_EXTRA)
-
-CHANGE_SETTING_SCHEMA = vol.Schema({
-    vol.Required(ATTR_SETTING): cv.string,
-    vol.Required(ATTR_VALUE): cv.string
-})
-
-CAPTURE_IMAGE_SCHEMA = vol.Schema({
-    ATTR_ENTITY_ID: cv.entity_ids,
-})
-
-TRIGGER_SCHEMA = vol.Schema({
-    ATTR_ENTITY_ID: cv.entity_ids,
-})
-
-ABODE_PLATFORMS = [
-    'alarm_control_panel', 'binary_sensor', 'lock', 'switch', 'cover',
-    'camera', 'light', 'sensor'
-]
-
-
-class AbodeSystem:
-    """Abode System class."""
-
-    def __init__(self, username, password, cache,
-                 name, polling, exclude, lights):
-        """Initialize the system."""
-        import abodepy
-        self.abode = abodepy.Abode(
-            username, password, auto_login=True, get_devices=True,
-            get_automations=True, cache_path=cache)
-        self.name = name
-        self.polling = polling
-        self.exclude = exclude
-        self.lights = lights
-        self.devices = []
-
-    def is_excluded(self, device):
-        """Check if a device is configured to be excluded."""
-        return device.device_id in self.exclude
-
-    def is_automation_excluded(self, automation):
-        """Check if an automation is configured to be excluded."""
-        return automation.automation_id in self.exclude
-
-    def is_light(self, device):
-        """Check if a switch device is configured as a light."""
-        import abodepy.helpers.constants as CONST
-
-        return (device.generic_type == CONST.TYPE_LIGHT or
-                (device.generic_type == CONST.TYPE_SWITCH and
-                 device.device_id in self.lights))
-
-
-def setup(hass, config):
-    """Set up Abode component."""
-    from abodepy.exceptions import AbodeException
-
-    conf = config[DOMAIN]
-    username = conf.get(CONF_USERNAME)
-    password = conf.get(CONF_PASSWORD)
-    name = conf.get(CONF_NAME)
-    polling = conf.get(CONF_POLLING)
-    exclude = conf.get(CONF_EXCLUDE)
-    lights = conf.get(CONF_LIGHTS)
-
-    try:
-        cache = hass.config.path(DEFAULT_CACHEDB)
-        hass.data[DOMAIN] = AbodeSystem(
-            username, password, cache, name, polling, exclude, lights)
-    except (AbodeException, ConnectTimeout, HTTPError) as ex:
-        _LOGGER.error("Unable to connect to Abode: %s", str(ex))
-
-        hass.components.persistent_notification.create(
-            'Error: {}<br />'
-            'You will need to restart hass after fixing.'
-            ''.format(ex),
-            title=NOTIFICATION_TITLE,
-            notification_id=NOTIFICATION_ID)
-        return False
-
-    setup_hass_services(hass)
-    setup_hass_events(hass)
-    setup_abode_events(hass)
-
-    for platform in ABODE_PLATFORMS:
-        discovery.load_platform(hass, platform, DOMAIN, {}, config)
-
-    return True
-
-
-def setup_hass_services(hass):
-    """Home assistant services."""
-    from abodepy.exceptions import AbodeException
-
-    def change_setting(call):
-        """Change an Abode system setting."""
-        setting = call.data.get(ATTR_SETTING)
-        value = call.data.get(ATTR_VALUE)
-
-        try:
-            hass.data[DOMAIN].abode.set_setting(setting, value)
-        except AbodeException as ex:
-            _LOGGER.warning(ex)
-
-    def capture_image(call):
-        """Capture a new image."""
-        entity_ids = call.data.get(ATTR_ENTITY_ID)
-
-        target_devices = [device for device in hass.data[DOMAIN].devices
-                          if device.entity_id in entity_ids]
-
-        for device in target_devices:
-            device.capture()
-
-    def trigger_quick_action(call):
-        """Trigger a quick action."""
-        entity_ids = call.data.get(ATTR_ENTITY_ID, None)
-
-        target_devices = [device for device in hass.data[DOMAIN].devices
-                          if device.entity_id in entity_ids]
-
-        for device in target_devices:
-            device.trigger()
-
-    hass.services.register(
-        DOMAIN, SERVICE_SETTINGS, change_setting,
-        schema=CHANGE_SETTING_SCHEMA)
-
-    hass.services.register(
-        DOMAIN, SERVICE_CAPTURE_IMAGE, capture_image,
-        schema=CAPTURE_IMAGE_SCHEMA)
-
-    hass.services.register(
-        DOMAIN, SERVICE_TRIGGER, trigger_quick_action,
-        schema=TRIGGER_SCHEMA)
-
-
-def setup_hass_events(hass):
-    """Home Assistant start and stop callbacks."""
-    def startup(event):
-        """Listen for push events."""
-        hass.data[DOMAIN].abode.events.start()
-
-    def logout(event):
-        """Logout of Abode."""
-        if not hass.data[DOMAIN].polling:
-            hass.data[DOMAIN].abode.events.stop()
-
-        hass.data[DOMAIN].abode.logout()
-        _LOGGER.info("Logged out of Abode")
-
-    if not hass.data[DOMAIN].polling:
-        hass.bus.listen_once(EVENT_HOMEASSISTANT_START, startup)
-
-    hass.bus.listen_once(EVENT_HOMEASSISTANT_STOP, logout)
-
-
-def setup_abode_events(hass):
-    """Event callbacks."""
-    import abodepy.helpers.timeline as TIMELINE
-
-    def event_callback(event, event_json):
-        """Handle an event callback from Abode."""
-        data = {
-            ATTR_DEVICE_ID: event_json.get(ATTR_DEVICE_ID, ''),
-            ATTR_DEVICE_NAME: event_json.get(ATTR_DEVICE_NAME, ''),
-            ATTR_DEVICE_TYPE: event_json.get(ATTR_DEVICE_TYPE, ''),
-            ATTR_EVENT_CODE: event_json.get(ATTR_EVENT_CODE, ''),
-            ATTR_EVENT_NAME: event_json.get(ATTR_EVENT_NAME, ''),
-            ATTR_EVENT_TYPE: event_json.get(ATTR_EVENT_TYPE, ''),
-            ATTR_EVENT_UTC: event_json.get(ATTR_EVENT_UTC, ''),
-            ATTR_USER_NAME: event_json.get(ATTR_USER_NAME, ''),
-            ATTR_DATE: event_json.get(ATTR_DATE, ''),
-            ATTR_TIME: event_json.get(ATTR_TIME, ''),
-        }
-
-        hass.bus.fire(event, data)
-
-    events = [TIMELINE.ALARM_GROUP, TIMELINE.ALARM_END_GROUP,
-              TIMELINE.PANEL_FAULT_GROUP, TIMELINE.PANEL_RESTORE_GROUP,
-              TIMELINE.AUTOMATION_GROUP]
-
-    for event in events:
-        hass.data[DOMAIN].abode.events.add_event_callback(
-            event,
-            partial(event_callback, event))
-
-
-class AbodeDevice(Entity):
-    """Representation of an Abode device."""
-
-    def __init__(self, data, device):
-        """Initialize a sensor for Abode device."""
-        self._data = data
-        self._device = device
-
-    @asyncio.coroutine
-    def async_added_to_hass(self):
-        """Subscribe Abode events."""
-        self.hass.async_add_job(
-            self._data.abode.events.add_device_callback,
-            self._device.device_id, self._update_callback
-        )
-
-    @property
-    def should_poll(self):
-        """Return the polling state."""
-        return self._data.polling
-
-    def update(self):
-        """Update automation state."""
-        self._device.refresh()
-
-    @property
-    def name(self):
-        """Return the name of the sensor."""
-        return self._device.name
-
-    @property
-    def device_state_attributes(self):
-        """Return the state attributes."""
-        return {
-            ATTR_ATTRIBUTION: CONF_ATTRIBUTION,
-            'device_id': self._device.device_id,
-            'battery_low': self._device.battery_low,
-            'no_response': self._device.no_response,
-            'device_type': self._device.type
-        }
-
-    def _update_callback(self, device):
-        """Update the device state."""
-        self.schedule_update_ha_state()
-
-
-class AbodeAutomation(Entity):
-    """Representation of an Abode automation."""
-
-    def __init__(self, data, automation, event=None):
-        """Initialize for Abode automation."""
-        self._data = data
-        self._automation = automation
-        self._event = event
-
-    @asyncio.coroutine
-    def async_added_to_hass(self):
-        """Subscribe Abode events."""
-        if self._event:
-            self.hass.async_add_job(
-                self._data.abode.events.add_event_callback,
-                self._event, self._update_callback
-            )
-
-    @property
-    def should_poll(self):
-        """Return the polling state."""
-        return self._data.polling
-
-    def update(self):
-        """Update automation state."""
-        self._automation.refresh()
-
-    @property
-    def name(self):
-        """Return the name of the sensor."""
-        return self._automation.name
-
-    @property
-    def device_state_attributes(self):
-        """Return the state attributes."""
-        return {
-            ATTR_ATTRIBUTION: CONF_ATTRIBUTION,
-            'automation_id': self._automation.automation_id,
-            'type': self._automation.type,
-            'sub_type': self._automation.sub_type
-        }
-
-    def _update_callback(self, device):
-        """Update the device state."""
-        self._automation.refresh()
-        self.schedule_update_ha_state()

homeassistant/components/abode/__init__.py

@@ -0,0 +1,338 @@
+"""Support for Abode Home Security system."""
+import logging
+from functools import partial
+from requests.exceptions import HTTPError, ConnectTimeout
+
+import voluptuous as vol
+
+from homeassistant.const import (
+    ATTR_ATTRIBUTION, ATTR_DATE, ATTR_TIME, ATTR_ENTITY_ID, CONF_USERNAME,
+    CONF_PASSWORD, CONF_EXCLUDE, CONF_NAME, CONF_LIGHTS,
+    EVENT_HOMEASSISTANT_STOP, EVENT_HOMEASSISTANT_START)
+from homeassistant.helpers import config_validation as cv
+from homeassistant.helpers import discovery
+from homeassistant.helpers.entity import Entity
+
+_LOGGER = logging.getLogger(__name__)
+
+ATTRIBUTION = "Data provided by goabode.com"
+
+CONF_POLLING = 'polling'
+
+DOMAIN = 'abode'
+DEFAULT_CACHEDB = './abodepy_cache.pickle'
+
+NOTIFICATION_ID = 'abode_notification'
+NOTIFICATION_TITLE = 'Abode Security Setup'
+
+EVENT_ABODE_ALARM = 'abode_alarm'
+EVENT_ABODE_ALARM_END = 'abode_alarm_end'
+EVENT_ABODE_AUTOMATION = 'abode_automation'
+EVENT_ABODE_FAULT = 'abode_panel_fault'
+EVENT_ABODE_RESTORE = 'abode_panel_restore'
+
+SERVICE_SETTINGS = 'change_setting'
+SERVICE_CAPTURE_IMAGE = 'capture_image'
+SERVICE_TRIGGER = 'trigger_quick_action'
+
+ATTR_DEVICE_ID = 'device_id'
+ATTR_DEVICE_NAME = 'device_name'
+ATTR_DEVICE_TYPE = 'device_type'
+ATTR_EVENT_CODE = 'event_code'
+ATTR_EVENT_NAME = 'event_name'
+ATTR_EVENT_TYPE = 'event_type'
+ATTR_EVENT_UTC = 'event_utc'
+ATTR_SETTING = 'setting'
+ATTR_USER_NAME = 'user_name'
+ATTR_VALUE = 'value'
+
+ABODE_DEVICE_ID_LIST_SCHEMA = vol.Schema([str])
+
+CONFIG_SCHEMA = vol.Schema({
+    DOMAIN: vol.Schema({
+        vol.Required(CONF_USERNAME): cv.string,
+        vol.Required(CONF_PASSWORD): cv.string,
+        vol.Optional(CONF_NAME): cv.string,
+        vol.Optional(CONF_POLLING, default=False): cv.boolean,
+        vol.Optional(CONF_EXCLUDE, default=[]): ABODE_DEVICE_ID_LIST_SCHEMA,
+        vol.Optional(CONF_LIGHTS, default=[]): ABODE_DEVICE_ID_LIST_SCHEMA
+    }),
+}, extra=vol.ALLOW_EXTRA)
+
+CHANGE_SETTING_SCHEMA = vol.Schema({
+    vol.Required(ATTR_SETTING): cv.string,
+    vol.Required(ATTR_VALUE): cv.string
+})
+
+CAPTURE_IMAGE_SCHEMA = vol.Schema({
+    ATTR_ENTITY_ID: cv.entity_ids,
+})
+
+TRIGGER_SCHEMA = vol.Schema({
+    ATTR_ENTITY_ID: cv.entity_ids,
+})
+
+ABODE_PLATFORMS = [
+    'alarm_control_panel', 'binary_sensor', 'lock', 'switch', 'cover',
+    'camera', 'light', 'sensor'
+]
+
+
+class AbodeSystem:
+    """Abode System class."""
+
+    def __init__(self, username, password, cache,
+                 name, polling, exclude, lights):
+        """Initialize the system."""
+        import abodepy
+        self.abode = abodepy.Abode(
+            username, password, auto_login=True, get_devices=True,
+            get_automations=True, cache_path=cache)
+        self.name = name
+        self.polling = polling
+        self.exclude = exclude
+        self.lights = lights
+        self.devices = []
+
+    def is_excluded(self, device):
+        """Check if a device is configured to be excluded."""
+        return device.device_id in self.exclude
+
+    def is_automation_excluded(self, automation):
+        """Check if an automation is configured to be excluded."""
+        return automation.automation_id in self.exclude
+
+    def is_light(self, device):
+        """Check if a switch device is configured as a light."""
+        import abodepy.helpers.constants as CONST
+
+        return (device.generic_type == CONST.TYPE_LIGHT or
+                (device.generic_type == CONST.TYPE_SWITCH and
+                 device.device_id in self.lights))
+
+
+def setup(hass, config):
+    """Set up Abode component."""
+    from abodepy.exceptions import AbodeException
+
+    conf = config[DOMAIN]
+    username = conf.get(CONF_USERNAME)
+    password = conf.get(CONF_PASSWORD)
+    name = conf.get(CONF_NAME)
+    polling = conf.get(CONF_POLLING)
+    exclude = conf.get(CONF_EXCLUDE)
+    lights = conf.get(CONF_LIGHTS)
+
+    try:
+        cache = hass.config.path(DEFAULT_CACHEDB)
+        hass.data[DOMAIN] = AbodeSystem(
+            username, password, cache, name, polling, exclude, lights)
+    except (AbodeException, ConnectTimeout, HTTPError) as ex:
+        _LOGGER.error("Unable to connect to Abode: %s", str(ex))
+
+        hass.components.persistent_notification.create(
+            'Error: {}<br />'
+            'You will need to restart hass after fixing.'
+            ''.format(ex),
+            title=NOTIFICATION_TITLE,
+            notification_id=NOTIFICATION_ID)
+        return False
+
+    setup_hass_services(hass)
+    setup_hass_events(hass)
+    setup_abode_events(hass)
+
+    for platform in ABODE_PLATFORMS:
+        discovery.load_platform(hass, platform, DOMAIN, {}, config)
+
+    return True
+
+
+def setup_hass_services(hass):
+    """Home assistant services."""
+    from abodepy.exceptions import AbodeException
+
+    def change_setting(call):
+        """Change an Abode system setting."""
+        setting = call.data.get(ATTR_SETTING)
+        value = call.data.get(ATTR_VALUE)
+
+        try:
+            hass.data[DOMAIN].abode.set_setting(setting, value)
+        except AbodeException as ex:
+            _LOGGER.warning(ex)
+
+    def capture_image(call):
+        """Capture a new image."""
+        entity_ids = call.data.get(ATTR_ENTITY_ID)
+
+        target_devices = [device for device in hass.data[DOMAIN].devices
+                          if device.entity_id in entity_ids]
+
+        for device in target_devices:
+            device.capture()
+
+    def trigger_quick_action(call):
+        """Trigger a quick action."""
+        entity_ids = call.data.get(ATTR_ENTITY_ID, None)
+
+        target_devices = [device for device in hass.data[DOMAIN].devices
+                          if device.entity_id in entity_ids]
+
+        for device in target_devices:
+            device.trigger()
+
+    hass.services.register(
+        DOMAIN, SERVICE_SETTINGS, change_setting,
+        schema=CHANGE_SETTING_SCHEMA)
+
+    hass.services.register(
+        DOMAIN, SERVICE_CAPTURE_IMAGE, capture_image,
+        schema=CAPTURE_IMAGE_SCHEMA)
+
+    hass.services.register(
+        DOMAIN, SERVICE_TRIGGER, trigger_quick_action,
+        schema=TRIGGER_SCHEMA)
+
+
+def setup_hass_events(hass):
+    """Home Assistant start and stop callbacks."""
+    def startup(event):
+        """Listen for push events."""
+        hass.data[DOMAIN].abode.events.start()
+
+    def logout(event):
+        """Logout of Abode."""
+        if not hass.data[DOMAIN].polling:
+            hass.data[DOMAIN].abode.events.stop()
+
+        hass.data[DOMAIN].abode.logout()
+        _LOGGER.info("Logged out of Abode")
+
+    if not hass.data[DOMAIN].polling:
+        hass.bus.listen_once(EVENT_HOMEASSISTANT_START, startup)
+
+    hass.bus.listen_once(EVENT_HOMEASSISTANT_STOP, logout)
+
+
+def setup_abode_events(hass):
+    """Event callbacks."""
+    import abodepy.helpers.timeline as TIMELINE
+
+    def event_callback(event, event_json):
+        """Handle an event callback from Abode."""
+        data = {
+            ATTR_DEVICE_ID: event_json.get(ATTR_DEVICE_ID, ''),
+            ATTR_DEVICE_NAME: event_json.get(ATTR_DEVICE_NAME, ''),
+            ATTR_DEVICE_TYPE: event_json.get(ATTR_DEVICE_TYPE, ''),
+            ATTR_EVENT_CODE: event_json.get(ATTR_EVENT_CODE, ''),
+            ATTR_EVENT_NAME: event_json.get(ATTR_EVENT_NAME, ''),
+            ATTR_EVENT_TYPE: event_json.get(ATTR_EVENT_TYPE, ''),
+            ATTR_EVENT_UTC: event_json.get(ATTR_EVENT_UTC, ''),
+            ATTR_USER_NAME: event_json.get(ATTR_USER_NAME, ''),
+            ATTR_DATE: event_json.get(ATTR_DATE, ''),
+            ATTR_TIME: event_json.get(ATTR_TIME, ''),
+        }
+
+        hass.bus.fire(event, data)
+
+    events = [TIMELINE.ALARM_GROUP, TIMELINE.ALARM_END_GROUP,
+              TIMELINE.PANEL_FAULT_GROUP, TIMELINE.PANEL_RESTORE_GROUP,
+              TIMELINE.AUTOMATION_GROUP]
+
+    for event in events:
+        hass.data[DOMAIN].abode.events.add_event_callback(
+            event,
+            partial(event_callback, event))
+
+
+class AbodeDevice(Entity):
+    """Representation of an Abode device."""
+
+    def __init__(self, data, device):
+        """Initialize a sensor for Abode device."""
+        self._data = data
+        self._device = device
+
+    async def async_added_to_hass(self):
+        """Subscribe Abode events."""
+        self.hass.async_add_job(
+            self._data.abode.events.add_device_callback,
+            self._device.device_id, self._update_callback
+        )
+
+    @property
+    def should_poll(self):
+        """Return the polling state."""
+        return self._data.polling
+
+    def update(self):
+        """Update automation state."""
+        self._device.refresh()
+
+    @property
+    def name(self):
+        """Return the name of the sensor."""
+        return self._device.name
+
+    @property
+    def device_state_attributes(self):
+        """Return the state attributes."""
+        return {
+            ATTR_ATTRIBUTION: ATTRIBUTION,
+            'device_id': self._device.device_id,
+            'battery_low': self._device.battery_low,
+            'no_response': self._device.no_response,
+            'device_type': self._device.type
+        }
+
+    def _update_callback(self, device):
+        """Update the device state."""
+        self.schedule_update_ha_state()
+
+
+class AbodeAutomation(Entity):
+    """Representation of an Abode automation."""
+
+    def __init__(self, data, automation, event=None):
+        """Initialize for Abode automation."""
+        self._data = data
+        self._automation = automation
+        self._event = event
+
+    async def async_added_to_hass(self):
+        """Subscribe Abode events."""
+        if self._event:
+            self.hass.async_add_job(
+                self._data.abode.events.add_event_callback,
+                self._event, self._update_callback
+            )
+
+    @property
+    def should_poll(self):
+        """Return the polling state."""
+        return self._data.polling
+
+    def update(self):
+        """Update automation state."""
+        self._automation.refresh()
+
+    @property
+    def name(self):
+        """Return the name of the sensor."""
+        return self._automation.name
+
+    @property
+    def device_state_attributes(self):
+        """Return the state attributes."""
+        return {
+            ATTR_ATTRIBUTION: ATTRIBUTION,
+            'automation_id': self._automation.automation_id,
+            'type': self._automation.type,
+            'sub_type': self._automation.sub_type
+        }
+
+    def _update_callback(self, device):
+        """Update the device state."""
+        self._automation.refresh()
+        self.schedule_update_ha_state()

homeassistant/components/abode/alarm_control_panel.py

@@ -0,0 +1,78 @@
+"""Support for Abode Security System alarm control panels."""
+import logging
+
+import homeassistant.components.alarm_control_panel as alarm
+from homeassistant.const import (
+    ATTR_ATTRIBUTION, STATE_ALARM_ARMED_AWAY, STATE_ALARM_ARMED_HOME,
+    STATE_ALARM_DISARMED)
+
+from . import ATTRIBUTION, DOMAIN as ABODE_DOMAIN, AbodeDevice
+
+_LOGGER = logging.getLogger(__name__)
+
+ICON = 'mdi:security'
+
+
+def setup_platform(hass, config, add_entities, discovery_info=None):
+    """Set up an alarm control panel for an Abode device."""
+    data = hass.data[ABODE_DOMAIN]
+
+    alarm_devices = [AbodeAlarm(data, data.abode.get_alarm(), data.name)]
+
+    data.devices.extend(alarm_devices)
+
+    add_entities(alarm_devices)
+
+
+class AbodeAlarm(AbodeDevice, alarm.AlarmControlPanel):
+    """An alarm_control_panel implementation for Abode."""
+
+    def __init__(self, data, device, name):
+        """Initialize the alarm control panel."""
+        super().__init__(data, device)
+        self._name = name
+
+    @property
+    def icon(self):
+        """Return the icon."""
+        return ICON
+
+    @property
+    def state(self):
+        """Return the state of the device."""
+        if self._device.is_standby:
+            state = STATE_ALARM_DISARMED
+        elif self._device.is_away:
+            state = STATE_ALARM_ARMED_AWAY
+        elif self._device.is_home:
+            state = STATE_ALARM_ARMED_HOME
+        else:
+            state = None
+        return state
+
+    def alarm_disarm(self, code=None):
+        """Send disarm command."""
+        self._device.set_standby()
+
+    def alarm_arm_home(self, code=None):
+        """Send arm home command."""
+        self._device.set_home()
+
+    def alarm_arm_away(self, code=None):
+        """Send arm away command."""
+        self._device.set_away()
+
+    @property
+    def name(self):
+        """Return the name of the alarm."""
+        return self._name or super().name
+
+    @property
+    def device_state_attributes(self):
+        """Return the state attributes."""
+        return {
+            ATTR_ATTRIBUTION: ATTRIBUTION,
+            'device_id': self._device.device_id,
+            'battery_backup': self._device.battery,
+            'cellular_backup': self._device.is_cellular,
+        }

homeassistant/components/abode/binary_sensor.py

@@ -0,0 +1,66 @@
+"""Support for Abode Security System binary sensors."""
+import logging
+
+from homeassistant.components.binary_sensor import BinarySensorDevice
+
+from . import DOMAIN as ABODE_DOMAIN, AbodeAutomation, AbodeDevice
+
+_LOGGER = logging.getLogger(__name__)
+
+
+def setup_platform(hass, config, add_entities, discovery_info=None):
+    """Set up a sensor for an Abode device."""
+    import abodepy.helpers.constants as CONST
+    import abodepy.helpers.timeline as TIMELINE
+
+    data = hass.data[ABODE_DOMAIN]
+
+    device_types = [CONST.TYPE_CONNECTIVITY, CONST.TYPE_MOISTURE,
+                    CONST.TYPE_MOTION, CONST.TYPE_OCCUPANCY,
+                    CONST.TYPE_OPENING]
+
+    devices = []
+    for device in data.abode.get_devices(generic_type=device_types):
+        if data.is_excluded(device):
+            continue
+
+        devices.append(AbodeBinarySensor(data, device))
+
+    for automation in data.abode.get_automations(
+            generic_type=CONST.TYPE_QUICK_ACTION):
+        if data.is_automation_excluded(automation):
+            continue
+
+        devices.append(AbodeQuickActionBinarySensor(
+            data, automation, TIMELINE.AUTOMATION_EDIT_GROUP))
+
+    data.devices.extend(devices)
+
+    add_entities(devices)
+
+
+class AbodeBinarySensor(AbodeDevice, BinarySensorDevice):
+    """A binary sensor implementation for Abode device."""
+
+    @property
+    def is_on(self):
+        """Return True if the binary sensor is on."""
+        return self._device.is_on
+
+    @property
+    def device_class(self):
+        """Return the class of the binary sensor."""
+        return self._device.generic_type
+
+
+class AbodeQuickActionBinarySensor(AbodeAutomation, BinarySensorDevice):
+    """A binary sensor implementation for Abode quick action automations."""
+
+    def trigger(self):
+        """Trigger a quick automation."""
+        self._automation.trigger()
+
+    @property
+    def is_on(self):
+        """Return True if the binary sensor is on."""
+        return self._automation.is_active

homeassistant/components/abode/camera.py

@@ -0,0 +1,92 @@
+"""Support for Abode Security System cameras."""
+from datetime import timedelta
+import logging
+
+import requests
+
+from homeassistant.components.camera import Camera
+from homeassistant.util import Throttle
+
+from . import DOMAIN as ABODE_DOMAIN, AbodeDevice
+
+MIN_TIME_BETWEEN_UPDATES = timedelta(seconds=90)
+
+_LOGGER = logging.getLogger(__name__)
+
+
+def setup_platform(hass, config, add_entities, discovery_info=None):
+    """Set up Abode camera devices."""
+    import abodepy.helpers.constants as CONST
+    import abodepy.helpers.timeline as TIMELINE
+
+    data = hass.data[ABODE_DOMAIN]
+
+    devices = []
+    for device in data.abode.get_devices(generic_type=CONST.TYPE_CAMERA):
+        if data.is_excluded(device):
+            continue
+
+        devices.append(AbodeCamera(data, device, TIMELINE.CAPTURE_IMAGE))
+
+    data.devices.extend(devices)
+
+    add_entities(devices)
+
+
+class AbodeCamera(AbodeDevice, Camera):
+    """Representation of an Abode camera."""
+
+    def __init__(self, data, device, event):
+        """Initialize the Abode device."""
+        AbodeDevice.__init__(self, data, device)
+        Camera.__init__(self)
+        self._event = event
+        self._response = None
+
+    async def async_added_to_hass(self):
+        """Subscribe Abode events."""
+        await super().async_added_to_hass()
+
+        self.hass.async_add_job(
+            self._data.abode.events.add_timeline_callback,
+            self._event, self._capture_callback
+        )
+
+    def capture(self):
+        """Request a new image capture."""
+        return self._device.capture()
+
+    @Throttle(MIN_TIME_BETWEEN_UPDATES)
+    def refresh_image(self):
+        """Find a new image on the timeline."""
+        if self._device.refresh_image():
+            self.get_image()
+
+    def get_image(self):
+        """Attempt to download the most recent capture."""
+        if self._device.image_url:
+            try:
+                self._response = requests.get(
+                    self._device.image_url, stream=True)
+
+                self._response.raise_for_status()
+            except requests.HTTPError as err:
+                _LOGGER.warning("Failed to get camera image: %s", err)
+                self._response = None
+        else:
+            self._response = None
+
+    def camera_image(self):
+        """Get a camera image."""
+        self.refresh_image()
+
+        if self._response:
+            return self._response.content
+
+        return None
+
+    def _capture_callback(self, capture):
+        """Update the image with the device then refresh device."""
+        self._device.update_image_location(capture)
+        self.get_image()
+        self.schedule_update_ha_state()

homeassistant/components/abode/cover.py

@@ -0,0 +1,43 @@
+"""Support for Abode Security System covers."""
+import logging
+
+from homeassistant.components.cover import CoverDevice
+
+from . import DOMAIN as ABODE_DOMAIN, AbodeDevice
+
+_LOGGER = logging.getLogger(__name__)
+
+
+def setup_platform(hass, config, add_entities, discovery_info=None):
+    """Set up Abode cover devices."""
+    import abodepy.helpers.constants as CONST
+
+    data = hass.data[ABODE_DOMAIN]
+
+    devices = []
+    for device in data.abode.get_devices(generic_type=CONST.TYPE_COVER):
+        if data.is_excluded(device):
+            continue
+
+        devices.append(AbodeCover(data, device))
+
+    data.devices.extend(devices)
+
+    add_entities(devices)
+
+
+class AbodeCover(AbodeDevice, CoverDevice):
+    """Representation of an Abode cover."""
+
+    @property
+    def is_closed(self):
+        """Return true if cover is closed, else False."""
+        return not self._device.is_open
+
+    def close_cover(self, **kwargs):
+        """Issue close command to cover."""
+        self._device.close_cover()
+
+    def open_cover(self, **kwargs):
+        """Issue open command to cover."""
+        self._device.open_cover()

homeassistant/components/abode/light.py

@@ -0,0 +1,97 @@
+"""Support for Abode Security System lights."""
+import logging
+from math import ceil
+
+from homeassistant.components.light import (
+    ATTR_BRIGHTNESS, ATTR_COLOR_TEMP, ATTR_HS_COLOR, SUPPORT_BRIGHTNESS,
+    SUPPORT_COLOR, SUPPORT_COLOR_TEMP, Light)
+from homeassistant.util.color import (
+    color_temperature_kelvin_to_mired, color_temperature_mired_to_kelvin)
+
+from . import DOMAIN as ABODE_DOMAIN, AbodeDevice
+
+_LOGGER = logging.getLogger(__name__)
+
+
+def setup_platform(hass, config, add_entities, discovery_info=None):
+    """Set up Abode light devices."""
+    import abodepy.helpers.constants as CONST
+
+    data = hass.data[ABODE_DOMAIN]
+
+    device_types = [CONST.TYPE_LIGHT, CONST.TYPE_SWITCH]
+
+    devices = []
+
+    # Get all regular lights that are not excluded or switches marked as lights
+    for device in data.abode.get_devices(generic_type=device_types):
+        if data.is_excluded(device) or not data.is_light(device):
+            continue
+
+        devices.append(AbodeLight(data, device))
+
+    data.devices.extend(devices)
+
+    add_entities(devices)
+
+
+class AbodeLight(AbodeDevice, Light):
+    """Representation of an Abode light."""
+
+    def turn_on(self, **kwargs):
+        """Turn on the light."""
+        if ATTR_COLOR_TEMP in kwargs and self._device.is_color_capable:
+            self._device.set_color_temp(
+                int(color_temperature_mired_to_kelvin(
+                    kwargs[ATTR_COLOR_TEMP])))
+
+        if ATTR_HS_COLOR in kwargs and self._device.is_color_capable:
+            self._device.set_color(kwargs[ATTR_HS_COLOR])
+
+        if ATTR_BRIGHTNESS in kwargs and self._device.is_dimmable:
+            # Convert HASS brightness (0-255) to Abode brightness (0-99)
+            # If 100 is sent to Abode, response is 99 causing an error
+            self._device.set_level(ceil(kwargs[ATTR_BRIGHTNESS] * 99 / 255.0))
+        else:
+            self._device.switch_on()
+
+    def turn_off(self, **kwargs):
+        """Turn off the light."""
+        self._device.switch_off()
+
+    @property
+    def is_on(self):
+        """Return true if device is on."""
+        return self._device.is_on
+
+    @property
+    def brightness(self):
+        """Return the brightness of the light."""
+        if self._device.is_dimmable and self._device.has_brightness:
+            brightness = int(self._device.brightness)
+            # Abode returns 100 during device initialization and device refresh
+            if brightness == 100:
+                return 255
+            # Convert Abode brightness (0-99) to HASS brightness (0-255)
+            return ceil(brightness * 255 / 99.0)
+
+    @property
+    def color_temp(self):
+        """Return the color temp of the light."""
+        if self._device.has_color:
+            return color_temperature_kelvin_to_mired(self._device.color_temp)
+
+    @property
+    def hs_color(self):
+        """Return the color of the light."""
+        if self._device.has_color:
+            return self._device.color
+
+    @property
+    def supported_features(self):
+        """Flag supported features."""
+        if self._device.is_dimmable and self._device.is_color_capable:
+            return SUPPORT_BRIGHTNESS | SUPPORT_COLOR | SUPPORT_COLOR_TEMP
+        if self._device.is_dimmable:
+            return SUPPORT_BRIGHTNESS
+        return 0

homeassistant/components/abode/lock.py

@@ -0,0 +1,43 @@
+"""Support for Abode Security System locks."""
+import logging
+
+from homeassistant.components.lock import LockDevice
+
+from . import DOMAIN as ABODE_DOMAIN, AbodeDevice
+
+_LOGGER = logging.getLogger(__name__)
+
+
+def setup_platform(hass, config, add_entities, discovery_info=None):
+    """Set up Abode lock devices."""
+    import abodepy.helpers.constants as CONST
+
+    data = hass.data[ABODE_DOMAIN]
+
+    devices = []
+    for device in data.abode.get_devices(generic_type=CONST.TYPE_LOCK):
+        if data.is_excluded(device):
+            continue
+
+        devices.append(AbodeLock(data, device))
+
+    data.devices.extend(devices)
+
+    add_entities(devices)
+
+
+class AbodeLock(AbodeDevice, LockDevice):
+    """Representation of an Abode lock."""
+
+    def lock(self, **kwargs):
+        """Lock the device."""
+        self._device.lock()
+
+    def unlock(self, **kwargs):
+        """Unlock the device."""
+        self._device.unlock()
+
+    @property
+    def is_locked(self):
+        """Return true if device is on."""
+        return self._device.is_locked

homeassistant/components/abode/manifest.json

@@ -0,0 +1,10 @@
+{
+  "domain": "abode",
+  "name": "Abode",
+  "documentation": "https://www.home-assistant.io/components/abode",
+  "requirements": [
+    "abodepy==0.15.0"
+  ],
+  "dependencies": [],
+  "codeowners": []
+}

homeassistant/components/abode/sensor.py

@@ -0,0 +1,77 @@
+"""Support for Abode Security System sensors."""
+import logging
+
+from homeassistant.const import (
+    DEVICE_CLASS_HUMIDITY, DEVICE_CLASS_ILLUMINANCE, DEVICE_CLASS_TEMPERATURE)
+
+from . import DOMAIN as ABODE_DOMAIN, AbodeDevice
+
+_LOGGER = logging.getLogger(__name__)
+
+# Sensor types: Name, icon
+SENSOR_TYPES = {
+    'temp': ['Temperature', DEVICE_CLASS_TEMPERATURE],
+    'humidity': ['Humidity', DEVICE_CLASS_HUMIDITY],
+    'lux': ['Lux', DEVICE_CLASS_ILLUMINANCE],
+}
+
+
+def setup_platform(hass, config, add_entities, discovery_info=None):
+    """Set up a sensor for an Abode device."""
+    import abodepy.helpers.constants as CONST
+
+    data = hass.data[ABODE_DOMAIN]
+
+    devices = []
+    for device in data.abode.get_devices(generic_type=CONST.TYPE_SENSOR):
+        if data.is_excluded(device):
+            continue
+
+        for sensor_type in SENSOR_TYPES:
+            devices.append(AbodeSensor(data, device, sensor_type))
+
+    data.devices.extend(devices)
+
+    add_entities(devices)
+
+
+class AbodeSensor(AbodeDevice):
+    """A sensor implementation for Abode devices."""
+
+    def __init__(self, data, device, sensor_type):
+        """Initialize a sensor for an Abode device."""
+        super().__init__(data, device)
+        self._sensor_type = sensor_type
+        self._name = '{0} {1}'.format(
+            self._device.name, SENSOR_TYPES[self._sensor_type][0])
+        self._device_class = SENSOR_TYPES[self._sensor_type][1]
+
+    @property
+    def name(self):
+        """Return the name of the sensor."""
+        return self._name
+
+    @property
+    def device_class(self):
+        """Return the device class."""
+        return self._device_class
+
+    @property
+    def state(self):
+        """Return the state of the sensor."""
+        if self._sensor_type == 'temp':
+            return self._device.temp
+        if self._sensor_type == 'humidity':
+            return self._device.humidity
+        if self._sensor_type == 'lux':
+            return self._device.lux
+
+    @property
+    def unit_of_measurement(self):
+        """Return the units of measurement."""
+        if self._sensor_type == 'temp':
+            return self._device.temp_unit
+        if self._sensor_type == 'humidity':
+            return self._device.humidity_unit
+        if self._sensor_type == 'lux':
+            return self._device.lux_unit

homeassistant/components/abode/services.yaml

@@ -0,0 +1,13 @@
+capture_image:
+  description: Request a new image capture from a camera device.
+  fields:
+    entity_id: {description: Entity id of the camera to request an image., example: camera.downstairs_motion_camera}
+change_setting:
+  description: Change an Abode system setting.
+  fields:
+    setting: {description: Setting to change., example: beeper_mute}
+    value: {description: Value of the setting., example: '1'}
+trigger_quick_action:
+  description: Trigger an Abode quick action.
+  fields:
+    entity_id: {description: Entity id of the quick action to trigger., example: binary_sensor.home_quick_action}

homeassistant/components/abode/switch.py

@@ -0,0 +1,72 @@
+"""Support for Abode Security System switches."""
+import logging
+
+from homeassistant.components.switch import SwitchDevice
+
+from . import DOMAIN as ABODE_DOMAIN, AbodeAutomation, AbodeDevice
+
+_LOGGER = logging.getLogger(__name__)
+
+
+def setup_platform(hass, config, add_entities, discovery_info=None):
+    """Set up Abode switch devices."""
+    import abodepy.helpers.constants as CONST
+    import abodepy.helpers.timeline as TIMELINE
+
+    data = hass.data[ABODE_DOMAIN]
+
+    devices = []
+
+    # Get all regular switches that are not excluded or marked as lights
+    for device in data.abode.get_devices(generic_type=CONST.TYPE_SWITCH):
+        if data.is_excluded(device) or data.is_light(device):
+            continue
+
+        devices.append(AbodeSwitch(data, device))
+
+    # Get all Abode automations that can be enabled/disabled
+    for automation in data.abode.get_automations(
+            generic_type=CONST.TYPE_AUTOMATION):
+        if data.is_automation_excluded(automation):
+            continue
+
+        devices.append(AbodeAutomationSwitch(
+            data, automation, TIMELINE.AUTOMATION_EDIT_GROUP))
+
+    data.devices.extend(devices)
+
+    add_entities(devices)
+
+
+class AbodeSwitch(AbodeDevice, SwitchDevice):
+    """Representation of an Abode switch."""
+
+    def turn_on(self, **kwargs):
+        """Turn on the device."""
+        self._device.switch_on()
+
+    def turn_off(self, **kwargs):
+        """Turn off the device."""
+        self._device.switch_off()
+
+    @property
+    def is_on(self):
+        """Return true if device is on."""
+        return self._device.is_on
+
+
+class AbodeAutomationSwitch(AbodeAutomation, SwitchDevice):
+    """A switch implementation for Abode automations."""
+
+    def turn_on(self, **kwargs):
+        """Turn on the device."""
+        self._automation.set_active(True)
+
+    def turn_off(self, **kwargs):
+        """Turn off the device."""
+        self._automation.set_active(False)
+
+    @property
+    def is_on(self):
+        """Return True if the binary sensor is on."""
+        return self._automation.is_active

homeassistant/components/acer_projector/__init__.py

@@ -0,0 +1 @@
+"""The acer_projector component."""

homeassistant/components/acer_projector/manifest.json

@@ -0,0 +1,10 @@
+{
+  "domain": "acer_projector",
+  "name": "Acer projector",
+  "documentation": "https://www.home-assistant.io/components/acer_projector",
+  "requirements": [
+    "pyserial==3.1.1"
+  ],
+  "dependencies": [],
+  "codeowners": []
+}

homeassistant/components/acer_projector/switch.py

@@ -0,0 +1,161 @@
+"""Use serial protocol of Acer projector to obtain state of the projector."""
+import logging
+import re
+
+import voluptuous as vol
+
+from homeassistant.components.switch import (SwitchDevice, PLATFORM_SCHEMA)
+from homeassistant.const import (
+    STATE_ON, STATE_OFF, STATE_UNKNOWN, CONF_NAME, CONF_FILENAME)
+import homeassistant.helpers.config_validation as cv
+
+_LOGGER = logging.getLogger(__name__)
+
+CONF_TIMEOUT = 'timeout'
+CONF_WRITE_TIMEOUT = 'write_timeout'
+
+DEFAULT_NAME = 'Acer Projector'
+DEFAULT_TIMEOUT = 1
+DEFAULT_WRITE_TIMEOUT = 1
+
+ECO_MODE = 'ECO Mode'
+
+ICON = 'mdi:projector'
+
+INPUT_SOURCE = 'Input Source'
+
+LAMP = 'Lamp'
+LAMP_HOURS = 'Lamp Hours'
+
+MODEL = 'Model'
+
+# Commands known to the projector
+CMD_DICT = {
+    LAMP: '* 0 Lamp ?\r',
+    LAMP_HOURS: '* 0 Lamp\r',
+    INPUT_SOURCE: '* 0 Src ?\r',
+    ECO_MODE: '* 0 IR 052\r',
+    MODEL: '* 0 IR 035\r',
+    STATE_ON: '* 0 IR 001\r',
+    STATE_OFF: '* 0 IR 002\r',
+}
+
+
+PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
+    vol.Required(CONF_FILENAME): cv.isdevice,
+    vol.Optional(CONF_NAME, default=DEFAULT_NAME): cv.string,
+    vol.Optional(CONF_TIMEOUT, default=DEFAULT_TIMEOUT): cv.positive_int,
+    vol.Optional(CONF_WRITE_TIMEOUT, default=DEFAULT_WRITE_TIMEOUT):
+        cv.positive_int,
+})
+
+
+def setup_platform(hass, config, add_entities, discovery_info=None):
+    """Connect with serial port and return Acer Projector."""
+    serial_port = config.get(CONF_FILENAME)
+    name = config.get(CONF_NAME)
+    timeout = config.get(CONF_TIMEOUT)
+    write_timeout = config.get(CONF_WRITE_TIMEOUT)
+
+    add_entities([AcerSwitch(serial_port, name, timeout, write_timeout)], True)
+
+
+class AcerSwitch(SwitchDevice):
+    """Represents an Acer Projector as a switch."""
+
+    def __init__(self, serial_port, name, timeout, write_timeout, **kwargs):
+        """Init of the Acer projector."""
+        import serial
+        self.ser = serial.Serial(
+            port=serial_port, timeout=timeout, write_timeout=write_timeout,
+            **kwargs)
+        self._serial_port = serial_port
+        self._name = name
+        self._state = False
+        self._available = False
+        self._attributes = {
+            LAMP_HOURS: STATE_UNKNOWN,
+            INPUT_SOURCE: STATE_UNKNOWN,
+            ECO_MODE: STATE_UNKNOWN,
+        }
+
+    def _write_read(self, msg):
+        """Write to the projector and read the return."""
+        import serial
+        ret = ""
+        # Sometimes the projector won't answer for no reason or the projector
+        # was disconnected during runtime.
+        # This way the projector can be reconnected and will still work
+        try:
+            if not self.ser.is_open:
+                self.ser.open()
+            msg = msg.encode('utf-8')
+            self.ser.write(msg)
+            # Size is an experience value there is no real limit.
+            # AFAIK there is no limit and no end character so we will usually
+            # need to wait for timeout
+            ret = self.ser.read_until(size=20).decode('utf-8')
+        except serial.SerialException:
+            _LOGGER.error('Problem communicating with %s', self._serial_port)
+        self.ser.close()
+        return ret
+
+    def _write_read_format(self, msg):
+        """Write msg, obtain answer and format output."""
+        # answers are formatted as ***\answer\r***
+        awns = self._write_read(msg)
+        match = re.search(r'\r(.+)\r', awns)
+        if match:
+            return match.group(1)
+        return STATE_UNKNOWN
+
+    @property
+    def available(self):
+        """Return if projector is available."""
+        return self._available
+
+    @property
+    def name(self):
+        """Return name of the projector."""
+        return self._name
+
+    @property
+    def is_on(self):
+        """Return if the projector is turned on."""
+        return self._state
+
+    @property
+    def state_attributes(self):
+        """Return state attributes."""
+        return self._attributes
+
+    def update(self):
+        """Get the latest state from the projector."""
+        msg = CMD_DICT[LAMP]
+        awns = self._write_read_format(msg)
+        if awns == 'Lamp 1':
+            self._state = True
+            self._available = True
+        elif awns == 'Lamp 0':
+            self._state = False
+            self._available = True
+        else:
+            self._available = False
+
+        for key in self._attributes:
+            msg = CMD_DICT.get(key, None)
+            if msg:
+                awns = self._write_read_format(msg)
+                self._attributes[key] = awns
+
+    def turn_on(self, **kwargs):
+        """Turn the projector on."""
+        msg = CMD_DICT[STATE_ON]
+        self._write_read(msg)
+        self._state = STATE_ON
+
+    def turn_off(self, **kwargs):
+        """Turn the projector off."""
+        msg = CMD_DICT[STATE_OFF]
+        self._write_read(msg)
+        self._state = STATE_OFF

homeassistant/components/actiontec/__init__.py

@@ -0,0 +1 @@
+"""The actiontec component."""

homeassistant/components/actiontec/device_tracker.py

@@ -0,0 +1,115 @@
+"""Support for Actiontec MI424WR (Verizon FIOS) routers."""
+import logging
+import re
+import telnetlib
+from collections import namedtuple
+import voluptuous as vol
+
+import homeassistant.helpers.config_validation as cv
+import homeassistant.util.dt as dt_util
+from homeassistant.components.device_tracker import (
+    DOMAIN, PLATFORM_SCHEMA, DeviceScanner)
+from homeassistant.const import CONF_HOST, CONF_PASSWORD, CONF_USERNAME
+
+_LOGGER = logging.getLogger(__name__)
+
+_LEASES_REGEX = re.compile(
+    r'(?P<ip>([0-9]{1,3}[\.]){3}[0-9]{1,3})' +
+    r'\smac:\s(?P<mac>([0-9a-f]{2}[:-]){5}([0-9a-f]{2}))' +
+    r'\svalid\sfor:\s(?P<timevalid>(-?\d+))' +
+    r'\ssec')
+
+PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
+    vol.Required(CONF_HOST): cv.string,
+    vol.Required(CONF_PASSWORD): cv.string,
+    vol.Required(CONF_USERNAME): cv.string
+})
+
+
+def get_scanner(hass, config):
+    """Validate the configuration and return an Actiontec scanner."""
+    scanner = ActiontecDeviceScanner(config[DOMAIN])
+    return scanner if scanner.success_init else None
+
+
+Device = namedtuple('Device', ['mac', 'ip', 'last_update'])
+
+
+class ActiontecDeviceScanner(DeviceScanner):
+    """This class queries an actiontec router for connected devices."""
+
+    def __init__(self, config):
+        """Initialize the scanner."""
+        self.host = config[CONF_HOST]
+        self.username = config[CONF_USERNAME]
+        self.password = config[CONF_PASSWORD]
+        self.last_results = []
+        data = self.get_actiontec_data()
+        self.success_init = data is not None
+        _LOGGER.info("canner initialized")
+
+    def scan_devices(self):
+        """Scan for new devices and return a list with found device IDs."""
+        self._update_info()
+        return [client.mac for client in self.last_results]
+
+    def get_device_name(self, device):
+        """Return the name of the given device or None if we don't know."""
+        if not self.last_results:
+            return None
+        for client in self.last_results:
+            if client.mac == device:
+                return client.ip
+        return None
+
+    def _update_info(self):
+        """Ensure the information from the router is up to date.
+
+        Return boolean if scanning successful.
+        """
+        _LOGGER.info("Scanning")
+        if not self.success_init:
+            return False
+
+        now = dt_util.now()
+        actiontec_data = self.get_actiontec_data()
+        if not actiontec_data:
+            return False
+        self.last_results = [Device(data['mac'], name, now)
+                             for name, data in actiontec_data.items()
+                             if data['timevalid'] > -60]
+        _LOGGER.info("Scan successful")
+        return True
+
+    def get_actiontec_data(self):
+        """Retrieve data from Actiontec MI424WR and return parsed result."""
+        try:
+            telnet = telnetlib.Telnet(self.host)
+            telnet.read_until(b'Username: ')
+            telnet.write((self.username + '\n').encode('ascii'))
+            telnet.read_until(b'Password: ')
+            telnet.write((self.password + '\n').encode('ascii'))
+            prompt = telnet.read_until(
+                b'Wireless Broadband Router> ').split(b'\n')[-1]
+            telnet.write('firewall mac_cache_dump\n'.encode('ascii'))
+            telnet.write('\n'.encode('ascii'))
+            telnet.read_until(prompt)
+            leases_result = telnet.read_until(prompt).split(b'\n')[1:-1]
+            telnet.write('exit\n'.encode('ascii'))
+        except EOFError:
+            _LOGGER.exception("Unexpected response from router")
+            return
+        except ConnectionRefusedError:
+            _LOGGER.exception("Connection refused by router. Telnet enabled?")
+            return None
+
+        devices = {}
+        for lease in leases_result:
+            match = _LEASES_REGEX.search(lease.decode('utf-8'))
+            if match is not None:
+                devices[match.group('ip')] = {
+                    'ip': match.group('ip'),
+                    'mac': match.group('mac').upper(),
+                    'timevalid': int(match.group('timevalid'))
+                    }
+        return devices

homeassistant/components/actiontec/manifest.json

@@ -0,0 +1,8 @@
+{
+  "domain": "actiontec",
+  "name": "Actiontec",
+  "documentation": "https://www.home-assistant.io/components/actiontec",
+  "requirements": [],
+  "dependencies": [],
+  "codeowners": []
+}

homeassistant/components/ads/__init__.py

@@ -1,38 +1,43 @@
-"""
-Support for Automation Device Specification (ADS).
-
-For more details about this component, please refer to the documentation.
-https://home-assistant.io/components/ads/
-"""
+"""Support for Automation Device Specification (ADS)."""
 import threading
 import struct
 import logging
 import ctypes
 from collections import namedtuple
-import voluptuous as vol
-from homeassistant.const import CONF_DEVICE, CONF_PORT, CONF_IP_ADDRESS, \
-    EVENT_HOMEASSISTANT_STOP
-import homeassistant.helpers.config_validation as cv
+import asyncio
+import async_timeout
 
-REQUIREMENTS = ['pyads==2.2.6']
+import voluptuous as vol
+
+from homeassistant.const import (
+    CONF_DEVICE, CONF_IP_ADDRESS, CONF_PORT, EVENT_HOMEASSISTANT_STOP)
+import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers.entity import Entity
 
 _LOGGER = logging.getLogger(__name__)
 
 DATA_ADS = 'data_ads'
 
 # Supported Types
-ADSTYPE_INT = 'int'
-ADSTYPE_UINT = 'uint'
-ADSTYPE_BYTE = 'byte'
 ADSTYPE_BOOL = 'bool'
+ADSTYPE_BYTE = 'byte'
+ADSTYPE_DINT = 'dint'
+ADSTYPE_INT = 'int'
+ADSTYPE_UDINT = 'udint'
+ADSTYPE_UINT = 'uint'
 
-DOMAIN = 'ads'
-
+CONF_ADS_FACTOR = 'factor'
+CONF_ADS_TYPE = 'adstype'
+CONF_ADS_VALUE = 'value'
 CONF_ADS_VAR = 'adsvar'
 CONF_ADS_VAR_BRIGHTNESS = 'adsvar_brightness'
-CONF_ADS_TYPE = 'adstype'
-CONF_ADS_FACTOR = 'factor'
-CONF_ADS_VALUE = 'value'
+CONF_ADS_VAR_POSITION = 'adsvar_position'
+
+STATE_KEY_STATE = 'state'
+STATE_KEY_BRIGHTNESS = 'brightness'
+STATE_KEY_POSITION = 'position'
+
+DOMAIN = 'ads'
 
 SERVICE_WRITE_DATA_BY_NAME = 'write_data_by_name'
 
@@ -46,8 +51,9 @@ CONFIG_SCHEMA = vol.Schema({
 
 SCHEMA_SERVICE_WRITE_DATA_BY_NAME = vol.Schema({
     vol.Required(CONF_ADS_TYPE):
-        vol.In([ADSTYPE_INT, ADSTYPE_UINT, ADSTYPE_BYTE]),
-    vol.Required(CONF_ADS_VALUE): cv.match_all,
+        vol.In([ADSTYPE_INT, ADSTYPE_UINT, ADSTYPE_BYTE, ADSTYPE_BOOL,
+                ADSTYPE_DINT, ADSTYPE_UDINT]),
+    vol.Required(CONF_ADS_VALUE): vol.Coerce(int),
     vol.Required(CONF_ADS_VAR): cv.string,
 })
 
@@ -66,21 +72,26 @@ def setup(hass, config):
     AdsHub.ADS_TYPEMAP = {
         ADSTYPE_BOOL: pyads.PLCTYPE_BOOL,
         ADSTYPE_BYTE: pyads.PLCTYPE_BYTE,
+        ADSTYPE_DINT: pyads.PLCTYPE_DINT,
         ADSTYPE_INT: pyads.PLCTYPE_INT,
+        ADSTYPE_UDINT: pyads.PLCTYPE_UDINT,
         ADSTYPE_UINT: pyads.PLCTYPE_UINT,
     }
 
+    AdsHub.ADSError = pyads.ADSError
     AdsHub.PLCTYPE_BOOL = pyads.PLCTYPE_BOOL
     AdsHub.PLCTYPE_BYTE = pyads.PLCTYPE_BYTE
+    AdsHub.PLCTYPE_DINT = pyads.PLCTYPE_DINT
     AdsHub.PLCTYPE_INT = pyads.PLCTYPE_INT
+    AdsHub.PLCTYPE_UDINT = pyads.PLCTYPE_UDINT
     AdsHub.PLCTYPE_UINT = pyads.PLCTYPE_UINT
-    AdsHub.ADSError = pyads.ADSError
 
     try:
         ads = AdsHub(client)
-    except pyads.pyads.ADSError:
+    except pyads.ADSError:
         _LOGGER.error(
-            "Could not connect to ADS host (netid=%s, port=%s)", net_id, port)
+            "Could not connect to ADS host (netid=%s, ip=%s, port=%s)",
+            net_id, ip_address, port)
         return False
 
     hass.data[DATA_ADS] = ads
@@ -125,16 +136,23 @@ class AdsHub:
 
     def shutdown(self, *args, **kwargs):
         """Shutdown ADS connection."""
+        import pyads
         _LOGGER.debug("Shutting down ADS")
         for notification_item in self._notification_items.values():
-            self._client.del_device_notification(
-                notification_item.hnotify,
-                notification_item.huser
-            )
             _LOGGER.debug(
                 "Deleting device notification %d, %d",
                 notification_item.hnotify, notification_item.huser)
-        self._client.close()
+            try:
+                self._client.del_device_notification(
+                    notification_item.hnotify,
+                    notification_item.huser
+                )
+            except pyads.ADSError as err:
+                _LOGGER.error(err)
+        try:
+            self._client.close()
+        except pyads.ADSError as err:
+            _LOGGER.error(err)
 
     def register_device(self, device):
         """Register a new device."""
@@ -142,31 +160,43 @@ class AdsHub:
 
     def write_by_name(self, name, value, plc_datatype):
         """Write a value to the device."""
+        import pyads
         with self._lock:
-            return self._client.write_by_name(name, value, plc_datatype)
+            try:
+                return self._client.write_by_name(name, value, plc_datatype)
+            except pyads.ADSError as err:
+                _LOGGER.error("Error writing %s: %s", name, err)
 
     def read_by_name(self, name, plc_datatype):
         """Read a value from the device."""
+        import pyads
         with self._lock:
-            return self._client.read_by_name(name, plc_datatype)
+            try:
+                return self._client.read_by_name(name, plc_datatype)
+            except pyads.ADSError as err:
+                _LOGGER.error("Error reading %s: %s", name, err)
 
     def add_device_notification(self, name, plc_datatype, callback):
         """Add a notification to the ADS devices."""
-        from pyads import NotificationAttrib
-        attr = NotificationAttrib(ctypes.sizeof(plc_datatype))
+        import pyads
+        attr = pyads.NotificationAttrib(ctypes.sizeof(plc_datatype))
 
         with self._lock:
-            hnotify, huser = self._client.add_device_notification(
-                name, attr, self._device_notification_callback)
-            hnotify = int(hnotify)
+            try:
+                hnotify, huser = self._client.add_device_notification(
+                    name, attr, self._device_notification_callback)
+            except pyads.ADSError as err:
+                _LOGGER.error("Error subscribing to %s: %s", name, err)
+            else:
+                hnotify = int(hnotify)
+                self._notification_items[hnotify] = NotificationItem(
+                    hnotify, huser, name, plc_datatype, callback)
 
-        _LOGGER.debug(
-            "Added device notification %d for variable %s", hnotify, name)
+                _LOGGER.debug(
+                    "Added device notification %d for variable %s",
+                    hnotify, name)
 
-        self._notification_items[hnotify] = NotificationItem(
-            hnotify, huser, name, plc_datatype, callback)
-
-    def _device_notification_callback(self, addr, notification, huser):
+    def _device_notification_callback(self, notification, name):
         """Handle device notifications."""
         contents = notification.contents
 
@@ -175,9 +205,10 @@ class AdsHub:
         data = contents.data
 
         try:
-            notification_item = self._notification_items[hnotify]
+            with self._lock:
+                notification_item = self._notification_items[hnotify]
         except KeyError:
-            _LOGGER.debug("Unknown device notification handle: %d", hnotify)
+            _LOGGER.error("Unknown device notification handle: %d", hnotify)
             return
 
         # Parse data to desired datatype
@@ -189,8 +220,77 @@ class AdsHub:
             value = struct.unpack('<B', bytearray(data)[:1])[0]
         elif notification_item.plc_datatype == self.PLCTYPE_UINT:
             value = struct.unpack('<H', bytearray(data)[:2])[0]
+        elif notification_item.plc_datatype == self.PLCTYPE_DINT:
+            value = struct.unpack('<i', bytearray(data)[:4])[0]
+        elif notification_item.plc_datatype == self.PLCTYPE_UDINT:
+            value = struct.unpack('<I', bytearray(data)[:4])[0]
         else:
             value = bytearray(data)
             _LOGGER.warning("No callback available for this datatype")
 
         notification_item.callback(notification_item.name, value)
+
+
+class AdsEntity(Entity):
+    """Representation of ADS entity."""
+
+    def __init__(self, ads_hub, name, ads_var):
+        """Initialize ADS binary sensor."""
+        self._name = name
+        self._unique_id = ads_var
+        self._state_dict = {}
+        self._state_dict[STATE_KEY_STATE] = None
+        self._ads_hub = ads_hub
+        self._ads_var = ads_var
+        self._event = None
+
+    async def async_initialize_device(
+            self, ads_var, plctype, state_key=STATE_KEY_STATE, factor=None):
+        """Register device notification."""
+        def update(name, value):
+            """Handle device notifications."""
+            _LOGGER.debug('Variable %s changed its value to %d', name, value)
+
+            if factor is None:
+                self._state_dict[state_key] = value
+            else:
+                self._state_dict[state_key] = value / factor
+
+            asyncio.run_coroutine_threadsafe(async_event_set(), self.hass.loop)
+            self.schedule_update_ha_state()
+
+        async def async_event_set():
+            """Set event in async context."""
+            self._event.set()
+
+        self._event = asyncio.Event()
+
+        await self.hass.async_add_executor_job(
+            self._ads_hub.add_device_notification,
+            ads_var, plctype, update)
+        try:
+            with async_timeout.timeout(10):
+                await self._event.wait()
+        except asyncio.TimeoutError:
+            _LOGGER.debug('Variable %s: Timeout during first update',
+                          ads_var)
+
+    @property
+    def name(self):
+        """Return the default name of the binary sensor."""
+        return self._name
+
+    @property
+    def unique_id(self):
+        """Return an unique identifier for this entity."""
+        return self._unique_id
+
+    @property
+    def should_poll(self):
+        """Return False because entity pushes its state to HA."""
+        return False
+
+    @property
+    def available(self):
+        """Return False if state has not been updated yet."""
+        return self._state_dict[STATE_KEY_STATE] is not None

homeassistant/components/ads/binary_sensor.py

@@ -0,0 +1,56 @@
+"""Support for ADS binary sensors."""
+import logging
+
+import voluptuous as vol
+
+from homeassistant.components.binary_sensor import (
+    DEVICE_CLASSES_SCHEMA, PLATFORM_SCHEMA, BinarySensorDevice)
+from homeassistant.const import CONF_DEVICE_CLASS, CONF_NAME
+import homeassistant.helpers.config_validation as cv
+
+from . import CONF_ADS_VAR, DATA_ADS, AdsEntity, STATE_KEY_STATE
+
+_LOGGER = logging.getLogger(__name__)
+
+DEFAULT_NAME = 'ADS binary sensor'
+PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
+    vol.Required(CONF_ADS_VAR): cv.string,
+    vol.Optional(CONF_NAME, default=DEFAULT_NAME): cv.string,
+    vol.Optional(CONF_DEVICE_CLASS): DEVICE_CLASSES_SCHEMA,
+})
+
+
+def setup_platform(hass, config, add_entities, discovery_info=None):
+    """Set up the Binary Sensor platform for ADS."""
+    ads_hub = hass.data.get(DATA_ADS)
+
+    ads_var = config.get(CONF_ADS_VAR)
+    name = config.get(CONF_NAME)
+    device_class = config.get(CONF_DEVICE_CLASS)
+
+    ads_sensor = AdsBinarySensor(ads_hub, name, ads_var, device_class)
+    add_entities([ads_sensor])
+
+
+class AdsBinarySensor(AdsEntity, BinarySensorDevice):
+    """Representation of ADS binary sensors."""
+
+    def __init__(self, ads_hub, name, ads_var, device_class):
+        """Initialize ADS binary sensor."""
+        super().__init__(ads_hub, name, ads_var)
+        self._device_class = device_class or 'moving'
+
+    async def async_added_to_hass(self):
+        """Register device notification."""
+        await self.async_initialize_device(self._ads_var,
+                                           self._ads_hub.PLCTYPE_BOOL)
+
+    @property
+    def is_on(self):
+        """Return True if the entity is on."""
+        return self._state_dict[STATE_KEY_STATE]
+
+    @property
+    def device_class(self):
+        """Return the device class."""
+        return self._device_class

homeassistant/components/ads/cover.py

@@ -0,0 +1,165 @@
+"""Support for ADS covers."""
+import logging
+
+import voluptuous as vol
+
+from homeassistant.components.cover import (
+    PLATFORM_SCHEMA, SUPPORT_OPEN, SUPPORT_CLOSE, SUPPORT_STOP,
+    SUPPORT_SET_POSITION, ATTR_POSITION, DEVICE_CLASSES_SCHEMA,
+    CoverDevice)
+from homeassistant.const import (
+    CONF_NAME, CONF_DEVICE_CLASS)
+import homeassistant.helpers.config_validation as cv
+
+from . import CONF_ADS_VAR, CONF_ADS_VAR_POSITION, DATA_ADS, \
+    AdsEntity, STATE_KEY_STATE, STATE_KEY_POSITION
+
+_LOGGER = logging.getLogger(__name__)
+
+DEFAULT_NAME = 'ADS Cover'
+
+CONF_ADS_VAR_SET_POS = 'adsvar_set_position'
+CONF_ADS_VAR_OPEN = 'adsvar_open'
+CONF_ADS_VAR_CLOSE = 'adsvar_close'
+CONF_ADS_VAR_STOP = 'adsvar_stop'
+
+PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
+    vol.Optional(CONF_ADS_VAR): cv.string,
+    vol.Optional(CONF_ADS_VAR_POSITION): cv.string,
+    vol.Optional(CONF_ADS_VAR_SET_POS): cv.string,
+    vol.Optional(CONF_ADS_VAR_CLOSE): cv.string,
+    vol.Optional(CONF_ADS_VAR_OPEN): cv.string,
+    vol.Optional(CONF_ADS_VAR_STOP): cv.string,
+    vol.Optional(CONF_NAME, default=DEFAULT_NAME): cv.string,
+    vol.Optional(CONF_DEVICE_CLASS): DEVICE_CLASSES_SCHEMA
+})
+
+
+def setup_platform(hass, config, add_entities, discovery_info=None):
+    """Set up the cover platform for ADS."""
+    ads_hub = hass.data[DATA_ADS]
+
+    ads_var_is_closed = config.get(CONF_ADS_VAR)
+    ads_var_position = config.get(CONF_ADS_VAR_POSITION)
+    ads_var_pos_set = config.get(CONF_ADS_VAR_SET_POS)
+    ads_var_open = config.get(CONF_ADS_VAR_OPEN)
+    ads_var_close = config.get(CONF_ADS_VAR_CLOSE)
+    ads_var_stop = config.get(CONF_ADS_VAR_STOP)
+    name = config[CONF_NAME]
+    device_class = config.get(CONF_DEVICE_CLASS)
+
+    add_entities([AdsCover(ads_hub,
+                           ads_var_is_closed,
+                           ads_var_position,
+                           ads_var_pos_set,
+                           ads_var_open,
+                           ads_var_close,
+                           ads_var_stop,
+                           name,
+                           device_class)])
+
+
+class AdsCover(AdsEntity, CoverDevice):
+    """Representation of ADS cover."""
+
+    def __init__(self, ads_hub,
+                 ads_var_is_closed, ads_var_position,
+                 ads_var_pos_set, ads_var_open,
+                 ads_var_close, ads_var_stop, name, device_class):
+        """Initialize AdsCover entity."""
+        super().__init__(ads_hub, name, ads_var_is_closed)
+        if self._ads_var is None:
+            if ads_var_position is not None:
+                self._unique_id = ads_var_position
+            elif ads_var_pos_set is not None:
+                self._unique_id = ads_var_pos_set
+            elif ads_var_open is not None:
+                self._unique_id = ads_var_open
+
+        self._state_dict[STATE_KEY_POSITION] = None
+        self._ads_var_position = ads_var_position
+        self._ads_var_pos_set = ads_var_pos_set
+        self._ads_var_open = ads_var_open
+        self._ads_var_close = ads_var_close
+        self._ads_var_stop = ads_var_stop
+        self._device_class = device_class
+
+    async def async_added_to_hass(self):
+        """Register device notification."""
+        if self._ads_var is not None:
+            await self.async_initialize_device(self._ads_var,
+                                               self._ads_hub.PLCTYPE_BOOL)
+
+        if self._ads_var_position is not None:
+            await self.async_initialize_device(self._ads_var_position,
+                                               self._ads_hub.PLCTYPE_BYTE,
+                                               STATE_KEY_POSITION)
+
+    @property
+    def device_class(self):
+        """Return the class of this cover."""
+        return self._device_class
+
+    @property
+    def is_closed(self):
+        """Return if the cover is closed."""
+        if self._ads_var is not None:
+            return self._state_dict[STATE_KEY_STATE]
+        if self._ads_var_position is not None:
+            return self._state_dict[STATE_KEY_POSITION] == 0
+        return None
+
+    @property
+    def current_cover_position(self):
+        """Return current position of cover."""
+        return self._state_dict[STATE_KEY_POSITION]
+
+    @property
+    def supported_features(self):
+        """Flag supported features."""
+        supported_features = SUPPORT_OPEN | SUPPORT_CLOSE
+
+        if self._ads_var_stop is not None:
+            supported_features |= SUPPORT_STOP
+
+        if self._ads_var_pos_set is not None:
+            supported_features |= SUPPORT_SET_POSITION
+
+        return supported_features
+
+    def stop_cover(self, **kwargs):
+        """Fire the stop action."""
+        if self._ads_var_stop:
+            self._ads_hub.write_by_name(self._ads_var_stop, True,
+                                        self._ads_hub.PLCTYPE_BOOL)
+
+    def set_cover_position(self, **kwargs):
+        """Set cover position."""
+        position = kwargs[ATTR_POSITION]
+        if self._ads_var_pos_set is not None:
+            self._ads_hub.write_by_name(self._ads_var_pos_set, position,
+                                        self._ads_hub.PLCTYPE_BYTE)
+
+    def open_cover(self, **kwargs):
+        """Move the cover up."""
+        if self._ads_var_open is not None:
+            self._ads_hub.write_by_name(self._ads_var_open, True,
+                                        self._ads_hub.PLCTYPE_BOOL)
+        elif self._ads_var_pos_set is not None:
+            self.set_cover_position(position=100)
+
+    def close_cover(self, **kwargs):
+        """Move the cover down."""
+        if self._ads_var_close is not None:
+            self._ads_hub.write_by_name(self._ads_var_close, True,
+                                        self._ads_hub.PLCTYPE_BOOL)
+        elif self._ads_var_pos_set is not None:
+            self.set_cover_position(position=0)
+
+    @property
+    def available(self):
+        """Return False if state has not been updated yet."""
+        if self._ads_var is not None or self._ads_var_position is not None:
+            return self._state_dict[STATE_KEY_STATE] is not None or \
+                   self._state_dict[STATE_KEY_POSITION] is not None
+        return True

homeassistant/components/ads/light.py

@@ -0,0 +1,85 @@
+"""Support for ADS light sources."""
+import logging
+
+import voluptuous as vol
+
+from homeassistant.components.light import (
+    ATTR_BRIGHTNESS, PLATFORM_SCHEMA, SUPPORT_BRIGHTNESS, Light)
+from homeassistant.const import CONF_NAME
+import homeassistant.helpers.config_validation as cv
+
+from . import CONF_ADS_VAR, CONF_ADS_VAR_BRIGHTNESS, DATA_ADS, \
+    AdsEntity, STATE_KEY_BRIGHTNESS, STATE_KEY_STATE
+
+_LOGGER = logging.getLogger(__name__)
+DEFAULT_NAME = 'ADS Light'
+PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
+    vol.Required(CONF_ADS_VAR): cv.string,
+    vol.Optional(CONF_ADS_VAR_BRIGHTNESS): cv.string,
+    vol.Optional(CONF_NAME, default=DEFAULT_NAME): cv.string
+})
+
+
+def setup_platform(hass, config, add_entities, discovery_info=None):
+    """Set up the light platform for ADS."""
+    ads_hub = hass.data.get(DATA_ADS)
+
+    ads_var_enable = config.get(CONF_ADS_VAR)
+    ads_var_brightness = config.get(CONF_ADS_VAR_BRIGHTNESS)
+    name = config.get(CONF_NAME)
+
+    add_entities([AdsLight(ads_hub, ads_var_enable, ads_var_brightness,
+                           name)])
+
+
+class AdsLight(AdsEntity, Light):
+    """Representation of ADS light."""
+
+    def __init__(self, ads_hub, ads_var_enable, ads_var_brightness, name):
+        """Initialize AdsLight entity."""
+        super().__init__(ads_hub, name, ads_var_enable)
+        self._state_dict[STATE_KEY_BRIGHTNESS] = None
+        self._ads_var_brightness = ads_var_brightness
+
+    async def async_added_to_hass(self):
+        """Register device notification."""
+        await self.async_initialize_device(self._ads_var,
+                                           self._ads_hub.PLCTYPE_BOOL)
+
+        if self._ads_var_brightness is not None:
+            await self.async_initialize_device(self._ads_var_brightness,
+                                               self._ads_hub.PLCTYPE_UINT,
+                                               STATE_KEY_BRIGHTNESS)
+
+    @property
+    def brightness(self):
+        """Return the brightness of the light (0..255)."""
+        return self._state_dict[STATE_KEY_BRIGHTNESS]
+
+    @property
+    def supported_features(self):
+        """Flag supported features."""
+        support = 0
+        if self._ads_var_brightness is not None:
+            support = SUPPORT_BRIGHTNESS
+        return support
+
+    @property
+    def is_on(self):
+        """Return True if the entity is on."""
+        return self._state_dict[STATE_KEY_STATE]
+
+    def turn_on(self, **kwargs):
+        """Turn the light on or set a specific dimmer value."""
+        brightness = kwargs.get(ATTR_BRIGHTNESS)
+        self._ads_hub.write_by_name(self._ads_var, True,
+                                    self._ads_hub.PLCTYPE_BOOL)
+
+        if self._ads_var_brightness is not None and brightness is not None:
+            self._ads_hub.write_by_name(self._ads_var_brightness, brightness,
+                                        self._ads_hub.PLCTYPE_UINT)
+
+    def turn_off(self, **kwargs):
+        """Turn the light off."""
+        self._ads_hub.write_by_name(self._ads_var, False,
+                                    self._ads_hub.PLCTYPE_BOOL)

homeassistant/components/ads/manifest.json

@@ -0,0 +1,10 @@
+{
+  "domain": "ads",
+  "name": "Ads",
+  "documentation": "https://www.home-assistant.io/components/ads",
+  "requirements": [
+    "pyads==3.0.7"
+  ],
+  "dependencies": [],
+  "codeowners": []
+}

homeassistant/components/ads/sensor.py

@@ -0,0 +1,71 @@
+"""Support for ADS sensors."""
+import logging
+
+import voluptuous as vol
+
+from homeassistant.components import ads
+from homeassistant.components.sensor import PLATFORM_SCHEMA
+from homeassistant.const import CONF_NAME, CONF_UNIT_OF_MEASUREMENT
+import homeassistant.helpers.config_validation as cv
+
+from . import CONF_ADS_FACTOR, CONF_ADS_TYPE, CONF_ADS_VAR, \
+    AdsEntity, STATE_KEY_STATE
+
+_LOGGER = logging.getLogger(__name__)
+
+DEFAULT_NAME = "ADS sensor"
+PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
+    vol.Required(CONF_ADS_VAR): cv.string,
+    vol.Optional(CONF_ADS_FACTOR): cv.positive_int,
+    vol.Optional(CONF_ADS_TYPE, default=ads.ADSTYPE_INT):
+        vol.In([ads.ADSTYPE_INT, ads.ADSTYPE_UINT, ads.ADSTYPE_BYTE,
+                ads.ADSTYPE_DINT, ads.ADSTYPE_UDINT]),
+    vol.Optional(CONF_NAME, default=DEFAULT_NAME): cv.string,
+    vol.Optional(CONF_UNIT_OF_MEASUREMENT, default=''): cv.string,
+})
+
+
+def setup_platform(hass, config, add_entities, discovery_info=None):
+    """Set up an ADS sensor device."""
+    ads_hub = hass.data.get(ads.DATA_ADS)
+
+    ads_var = config.get(CONF_ADS_VAR)
+    ads_type = config.get(CONF_ADS_TYPE)
+    name = config.get(CONF_NAME)
+    unit_of_measurement = config.get(CONF_UNIT_OF_MEASUREMENT)
+    factor = config.get(CONF_ADS_FACTOR)
+
+    entity = AdsSensor(
+        ads_hub, ads_var, ads_type, name, unit_of_measurement, factor)
+
+    add_entities([entity])
+
+
+class AdsSensor(AdsEntity):
+    """Representation of an ADS sensor entity."""
+
+    def __init__(self, ads_hub, ads_var, ads_type, name, unit_of_measurement,
+                 factor):
+        """Initialize AdsSensor entity."""
+        super().__init__(ads_hub, name, ads_var)
+        self._unit_of_measurement = unit_of_measurement
+        self._ads_type = ads_type
+        self._factor = factor
+
+    async def async_added_to_hass(self):
+        """Register device notification."""
+        await self.async_initialize_device(
+            self._ads_var,
+            self._ads_hub.ADS_TYPEMAP[self._ads_type],
+            STATE_KEY_STATE,
+            self._factor)
+
+    @property
+    def state(self):
+        """Return the state of the device."""
+        return self._state_dict[STATE_KEY_STATE]
+
+    @property
+    def unit_of_measurement(self):
+        """Return the unit of measurement."""
+        return self._unit_of_measurement

homeassistant/components/ads/switch.py

@@ -0,0 +1,53 @@
+"""Support for ADS switch platform."""
+import logging
+
+import voluptuous as vol
+
+from homeassistant.components.switch import SwitchDevice, PLATFORM_SCHEMA
+from homeassistant.const import CONF_NAME
+import homeassistant.helpers.config_validation as cv
+
+from . import CONF_ADS_VAR, DATA_ADS, AdsEntity, STATE_KEY_STATE
+
+_LOGGER = logging.getLogger(__name__)
+
+DEFAULT_NAME = 'ADS Switch'
+
+PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
+    vol.Required(CONF_ADS_VAR): cv.string,
+    vol.Optional(CONF_NAME): cv.string,
+})
+
+
+def setup_platform(hass, config, add_entities, discovery_info=None):
+    """Set up switch platform for ADS."""
+    ads_hub = hass.data.get(DATA_ADS)
+
+    name = config.get(CONF_NAME)
+    ads_var = config.get(CONF_ADS_VAR)
+
+    add_entities([AdsSwitch(ads_hub, name, ads_var)])
+
+
+class AdsSwitch(AdsEntity, SwitchDevice):
+    """Representation of an ADS switch device."""
+
+    async def async_added_to_hass(self):
+        """Register device notification."""
+        await self.async_initialize_device(self._ads_var,
+                                           self._ads_hub.PLCTYPE_BOOL)
+
+    @property
+    def is_on(self):
+        """Return True if the entity is on."""
+        return self._state_dict[STATE_KEY_STATE]
+
+    def turn_on(self, **kwargs):
+        """Turn the switch on."""
+        self._ads_hub.write_by_name(
+            self._ads_var, True, self._ads_hub.PLCTYPE_BOOL)
+
+    def turn_off(self, **kwargs):
+        """Turn the switch off."""
+        self._ads_hub.write_by_name(
+            self._ads_var, False, self._ads_hub.PLCTYPE_BOOL)

homeassistant/components/aftership/__init__.py

@@ -0,0 +1 @@
+"""The aftership component."""

homeassistant/components/aftership/const.py

@@ -0,0 +1,2 @@
+"""Constants for the Aftership integration."""
+DOMAIN = 'aftership'

homeassistant/components/aftership/manifest.json

@@ -0,0 +1,10 @@
+{
+  "domain": "aftership",
+  "name": "Aftership",
+  "documentation": "https://www.home-assistant.io/components/aftership",
+  "requirements": [
+    "pyaftership==0.1.2"
+  ],
+  "dependencies": [],
+  "codeowners": []
+}

homeassistant/components/aftership/sensor.py

@@ -0,0 +1,204 @@
+"""Support for non-delivered packages recorded in AfterShip."""
+from datetime import timedelta
+import logging
+
+import voluptuous as vol
+
+from homeassistant.components.sensor import PLATFORM_SCHEMA
+from homeassistant.const import ATTR_ATTRIBUTION, CONF_API_KEY, CONF_NAME
+from homeassistant.helpers.aiohttp_client import async_get_clientsession
+import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers.dispatcher import async_dispatcher_send
+from homeassistant.helpers.entity import Entity
+from homeassistant.util import Throttle
+from .const import DOMAIN
+
+_LOGGER = logging.getLogger(__name__)
+
+ATTRIBUTION = 'Information provided by AfterShip'
+ATTR_TRACKINGS = 'trackings'
+
+BASE = 'https://track.aftership.com/'
+
+CONF_SLUG = 'slug'
+CONF_TITLE = 'title'
+CONF_TRACKING_NUMBER = 'tracking_number'
+
+DEFAULT_NAME = 'aftership'
+UPDATE_TOPIC = DOMAIN + '_update'
+
+ICON = 'mdi:package-variant-closed'
+
+MIN_TIME_BETWEEN_UPDATES = timedelta(minutes=5)
+
+SERVICE_ADD_TRACKING = 'add_tracking'
+SERVICE_REMOVE_TRACKING = 'remove_tracking'
+
+ADD_TRACKING_SERVICE_SCHEMA = vol.Schema(
+    {
+        vol.Required(CONF_TRACKING_NUMBER): cv.string,
+        vol.Optional(CONF_TITLE): cv.string,
+        vol.Optional(CONF_SLUG): cv.string,
+    }
+)
+
+REMOVE_TRACKING_SERVICE_SCHEMA = vol.Schema(
+    {vol.Required(CONF_SLUG): cv.string,
+     vol.Required(CONF_TRACKING_NUMBER): cv.string}
+)
+
+PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
+    vol.Required(CONF_API_KEY): cv.string,
+    vol.Optional(CONF_NAME, default=DEFAULT_NAME): cv.string,
+})
+
+
+async def async_setup_platform(
+        hass, config, async_add_entities, discovery_info=None):
+    """Set up the AfterShip sensor platform."""
+    from pyaftership.tracker import Tracking
+
+    apikey = config[CONF_API_KEY]
+    name = config[CONF_NAME]
+
+    session = async_get_clientsession(hass)
+    aftership = Tracking(hass.loop, session, apikey)
+
+    await aftership.get_trackings()
+
+    if not aftership.meta or aftership.meta['code'] != 200:
+        _LOGGER.error("No tracking data found. Check API key is correct: %s",
+                      aftership.meta)
+        return
+
+    instance = AfterShipSensor(aftership, name)
+
+    async_add_entities([instance], True)
+
+    async def handle_add_tracking(call):
+        """Call when a user adds a new Aftership tracking from HASS."""
+        title = call.data.get(CONF_TITLE)
+        slug = call.data.get(CONF_SLUG)
+        tracking_number = call.data[CONF_TRACKING_NUMBER]
+
+        await aftership.add_package_tracking(tracking_number, title, slug)
+        async_dispatcher_send(hass, UPDATE_TOPIC)
+
+    hass.services.async_register(
+        DOMAIN,
+        SERVICE_ADD_TRACKING,
+        handle_add_tracking,
+        schema=ADD_TRACKING_SERVICE_SCHEMA,
+    )
+
+    async def handle_remove_tracking(call):
+        """Call when a user removes an Aftership tracking from HASS."""
+        slug = call.data[CONF_SLUG]
+        tracking_number = call.data[CONF_TRACKING_NUMBER]
+
+        await aftership.remove_package_tracking(slug, tracking_number)
+        async_dispatcher_send(hass, UPDATE_TOPIC)
+
+    hass.services.async_register(
+        DOMAIN,
+        SERVICE_REMOVE_TRACKING,
+        handle_remove_tracking,
+        schema=REMOVE_TRACKING_SERVICE_SCHEMA,
+    )
+
+
+class AfterShipSensor(Entity):
+    """Representation of a AfterShip sensor."""
+
+    def __init__(self, aftership, name):
+        """Initialize the sensor."""
+        self._attributes = {}
+        self._name = name
+        self._state = None
+        self.aftership = aftership
+
+    @property
+    def name(self):
+        """Return the name of the sensor."""
+        return self._name
+
+    @property
+    def state(self):
+        """Return the state of the sensor."""
+        return self._state
+
+    @property
+    def unit_of_measurement(self):
+        """Return the unit of measurement of this entity, if any."""
+        return 'packages'
+
+    @property
+    def device_state_attributes(self):
+        """Return attributes for the sensor."""
+        return self._attributes
+
+    @property
+    def icon(self):
+        """Icon to use in the frontend."""
+        return ICON
+
+    async def async_added_to_hass(self):
+        """Register callbacks."""
+        self.hass.helpers.dispatcher.async_dispatcher_connect(
+            UPDATE_TOPIC, self.force_update)
+
+    async def force_update(self):
+        """Force update of data."""
+        await self.async_update(no_throttle=True)
+        await self.async_update_ha_state()
+
+    @Throttle(MIN_TIME_BETWEEN_UPDATES)
+    async def async_update(self, **kwargs):
+        """Get the latest data from the AfterShip API."""
+        await self.aftership.get_trackings()
+
+        if not self.aftership.meta:
+            _LOGGER.error("Unknown errors when querying")
+            return
+        if self.aftership.meta['code'] != 200:
+            _LOGGER.error(
+                "Errors when querying AfterShip. %s", str(self.aftership.meta))
+            return
+
+        status_to_ignore = {'delivered'}
+        status_counts = {}
+        trackings = []
+        not_delivered_count = 0
+
+        for track in self.aftership.trackings['trackings']:
+            status = track['tag'].lower()
+            name = (
+                track['tracking_number']
+                if track['title'] is None
+                else track['title']
+            )
+            status_counts[status] = status_counts.get(status, 0) + 1
+            trackings.append({
+                'name': name,
+                'tracking_number': track['tracking_number'],
+                'slug': track['slug'],
+                'link': '%s%s/%s' %
+                        (BASE, track['slug'], track['tracking_number']),
+                'last_update': track['updated_at'],
+                'expected_delivery': track['expected_delivery'],
+                'status': track['tag'],
+                'last_checkpoint': track['checkpoints'][-1]
+            })
+
+            if status not in status_to_ignore:
+                not_delivered_count += 1
+            else:
+                _LOGGER.debug("Ignoring %s as it has status: %s", name, status)
+
+        self._attributes = {
+            ATTR_ATTRIBUTION: ATTRIBUTION,
+            **status_counts,
+            ATTR_TRACKINGS: trackings,
+        }
+
+        self._state = not_delivered_count

homeassistant/components/aftership/services.yaml

@@ -0,0 +1,24 @@
+# Describes the format for available aftership services
+
+add_tracking:
+  description: Add new tracking to Aftership.
+  fields:
+    tracking_number:
+      description: Tracking number for the new tracking
+      example: '123456789'
+    title:
+      description: A custom title for the new tracking
+      example: 'Laptop'
+    slug:
+      description: Slug (carrier) of the new tracking
+      example: 'USPS'
+
+remove_tracking:
+  description: Remove a tracking from Aftership.
+  fields:
+    tracking_number:
+      description: Tracking number of the tracking to remove
+      example: '123456789'
+    slug:
+      description: Slug (carrier) of the tracking to remove
+      example: 'USPS'

homeassistant/components/air_quality/__init__.py

@@ -0,0 +1,143 @@
+"""Component for handling Air Quality data for your location."""
+from datetime import timedelta
+import logging
+
+from homeassistant.helpers.entity_component import EntityComponent
+from homeassistant.helpers.config_validation import (  # noqa
+    PLATFORM_SCHEMA, PLATFORM_SCHEMA_BASE)
+from homeassistant.helpers.entity import Entity
+
+_LOGGER = logging.getLogger(__name__)
+
+ATTR_AQI = 'air_quality_index'
+ATTR_ATTRIBUTION = 'attribution'
+ATTR_CO2 = 'carbon_dioxide'
+ATTR_CO = 'carbon_monoxide'
+ATTR_N2O = 'nitrogen_oxide'
+ATTR_NO = 'nitrogen_monoxide'
+ATTR_NO2 = 'nitrogen_dioxide'
+ATTR_OZONE = 'ozone'
+ATTR_PM_0_1 = 'particulate_matter_0_1'
+ATTR_PM_10 = 'particulate_matter_10'
+ATTR_PM_2_5 = 'particulate_matter_2_5'
+ATTR_SO2 = 'sulphur_dioxide'
+
+DOMAIN = 'air_quality'
+
+ENTITY_ID_FORMAT = DOMAIN + '.{}'
+
+SCAN_INTERVAL = timedelta(seconds=30)
+
+PROP_TO_ATTR = {
+    'air_quality_index': ATTR_AQI,
+    'attribution': ATTR_ATTRIBUTION,
+    'carbon_dioxide': ATTR_CO2,
+    'carbon_monoxide': ATTR_CO,
+    'nitrogen_oxide': ATTR_N2O,
+    'nitrogen_monoxide': ATTR_NO,
+    'nitrogen_dioxide': ATTR_NO2,
+    'ozone': ATTR_OZONE,
+    'particulate_matter_0_1': ATTR_PM_0_1,
+    'particulate_matter_10': ATTR_PM_10,
+    'particulate_matter_2_5': ATTR_PM_2_5,
+    'sulphur_dioxide': ATTR_SO2,
+}
+
+
+async def async_setup(hass, config):
+    """Set up the air quality component."""
+    component = hass.data[DOMAIN] = EntityComponent(
+        _LOGGER, DOMAIN, hass, SCAN_INTERVAL)
+    await component.async_setup(config)
+    return True
+
+
+async def async_setup_entry(hass, entry):
+    """Set up a config entry."""
+    return await hass.data[DOMAIN].async_setup_entry(entry)
+
+
+async def async_unload_entry(hass, entry):
+    """Unload a config entry."""
+    return await hass.data[DOMAIN].async_unload_entry(entry)
+
+
+class AirQualityEntity(Entity):
+    """ABC for air quality data."""
+
+    @property
+    def particulate_matter_2_5(self):
+        """Return the particulate matter 2.5 level."""
+        raise NotImplementedError()
+
+    @property
+    def particulate_matter_10(self):
+        """Return the particulate matter 10 level."""
+        return None
+
+    @property
+    def particulate_matter_0_1(self):
+        """Return the particulate matter 0.1 level."""
+        return None
+
+    @property
+    def air_quality_index(self):
+        """Return the Air Quality Index (AQI)."""
+        return None
+
+    @property
+    def ozone(self):
+        """Return the O3 (ozone) level."""
+        return None
+
+    @property
+    def carbon_monoxide(self):
+        """Return the CO (carbon monoxide) level."""
+        return None
+
+    @property
+    def carbon_dioxide(self):
+        """Return the CO2 (carbon dioxide) level."""
+        return None
+
+    @property
+    def attribution(self):
+        """Return the attribution."""
+        return None
+
+    @property
+    def sulphur_dioxide(self):
+        """Return the SO2 (sulphur dioxide) level."""
+        return None
+
+    @property
+    def nitrogen_oxide(self):
+        """Return the N2O (nitrogen oxide) level."""
+        return None
+
+    @property
+    def nitrogen_monoxide(self):
+        """Return the NO (nitrogen monoxide) level."""
+        return None
+
+    @property
+    def nitrogen_dioxide(self):
+        """Return the NO2 (nitrogen dioxide) level."""
+        return None
+
+    @property
+    def state_attributes(self):
+        """Return the state attributes."""
+        data = {}
+
+        for prop, attr in PROP_TO_ATTR.items():
+            value = getattr(self, prop)
+            if value is not None:
+                data[attr] = value
+
+        return data
+
+    @property
+    def state(self):
+        """Return the current state."""
+        return self.particulate_matter_2_5

homeassistant/components/air_quality/manifest.json

@@ -0,0 +1,8 @@
+{
+  "domain": "air_quality",
+  "name": "Air quality",
+  "documentation": "https://www.home-assistant.io/components/air_quality",
+  "requirements": [],
+  "dependencies": [],
+  "codeowners": []
+}

homeassistant/components/airvisual/__init__.py

@@ -0,0 +1 @@
+"""The airvisual component."""

homeassistant/components/airvisual/manifest.json

@@ -0,0 +1,12 @@
+{
+  "domain": "airvisual",
+  "name": "Airvisual",
+  "documentation": "https://www.home-assistant.io/components/airvisual",
+  "requirements": [
+    "pyairvisual==3.0.1"
+  ],
+  "dependencies": [],
+  "codeowners": [
+    "@bachya"
+  ]
+}

homeassistant/components/airvisual/sensor.py

@@ -0,0 +1,294 @@
+"""Support for AirVisual air quality sensors."""
+from logging import getLogger
+from datetime import timedelta
+
+import voluptuous as vol
+
+from homeassistant.components.sensor import PLATFORM_SCHEMA
+from homeassistant.const import (
+    ATTR_ATTRIBUTION, ATTR_LATITUDE, ATTR_LONGITUDE, CONF_API_KEY,
+    CONF_LATITUDE, CONF_LONGITUDE, CONF_MONITORED_CONDITIONS,
+    CONF_SCAN_INTERVAL, CONF_STATE, CONF_SHOW_ON_MAP)
+from homeassistant.helpers import aiohttp_client, config_validation as cv
+from homeassistant.helpers.entity import Entity
+from homeassistant.util import Throttle
+
+_LOGGER = getLogger(__name__)
+
+ATTR_CITY = 'city'
+ATTR_COUNTRY = 'country'
+ATTR_POLLUTANT_SYMBOL = 'pollutant_symbol'
+ATTR_POLLUTANT_UNIT = 'pollutant_unit'
+ATTR_REGION = 'region'
+
+CONF_CITY = 'city'
+CONF_COUNTRY = 'country'
+
+DEFAULT_ATTRIBUTION = "Data provided by AirVisual"
+DEFAULT_SCAN_INTERVAL = timedelta(minutes=10)
+
+MASS_PARTS_PER_MILLION = 'ppm'
+MASS_PARTS_PER_BILLION = 'ppb'
+VOLUME_MICROGRAMS_PER_CUBIC_METER = 'µg/m3'
+
+SENSOR_TYPE_LEVEL = 'air_pollution_level'
+SENSOR_TYPE_AQI = 'air_quality_index'
+SENSOR_TYPE_POLLUTANT = 'main_pollutant'
+SENSORS = [
+    (SENSOR_TYPE_LEVEL, 'Air Pollution Level', 'mdi:gauge', None),
+    (SENSOR_TYPE_AQI, 'Air Quality Index', 'mdi:chart-line', 'AQI'),
+    (SENSOR_TYPE_POLLUTANT, 'Main Pollutant', 'mdi:chemical-weapon', None),
+]
+
+POLLUTANT_LEVEL_MAPPING = [{
+    'label': 'Good',
+    'icon': 'mdi:emoticon-excited',
+    'minimum': 0,
+    'maximum': 50
+}, {
+    'label': 'Moderate',
+    'icon': 'mdi:emoticon-happy',
+    'minimum': 51,
+    'maximum': 100
+}, {
+    'label': 'Unhealthy for sensitive groups',
+    'icon': 'mdi:emoticon-neutral',
+    'minimum': 101,
+    'maximum': 150
+}, {
+    'label': 'Unhealthy',
+    'icon': 'mdi:emoticon-sad',
+    'minimum': 151,
+    'maximum': 200
+}, {
+    'label': 'Very Unhealthy',
+    'icon': 'mdi:emoticon-dead',
+    'minimum': 201,
+    'maximum': 300
+}, {
+    'label': 'Hazardous',
+    'icon': 'mdi:biohazard',
+    'minimum': 301,
+    'maximum': 10000
+}]
+
+POLLUTANT_MAPPING = {
+    'co': {
+        'label': 'Carbon Monoxide',
+        'unit': MASS_PARTS_PER_MILLION
+    },
+    'n2': {
+        'label': 'Nitrogen Dioxide',
+        'unit': MASS_PARTS_PER_BILLION
+    },
+    'o3': {
+        'label': 'Ozone',
+        'unit': MASS_PARTS_PER_BILLION
+    },
+    'p1': {
+        'label': 'PM10',
+        'unit': VOLUME_MICROGRAMS_PER_CUBIC_METER
+    },
+    'p2': {
+        'label': 'PM2.5',
+        'unit': VOLUME_MICROGRAMS_PER_CUBIC_METER
+    },
+    's2': {
+        'label': 'Sulfur Dioxide',
+        'unit': MASS_PARTS_PER_BILLION
+    },
+}
+
+SENSOR_LOCALES = {'cn': 'Chinese', 'us': 'U.S.'}
+
+PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
+    vol.Required(CONF_API_KEY): cv.string,
+    vol.Required(CONF_MONITORED_CONDITIONS, default=list(SENSOR_LOCALES)):
+        vol.All(cv.ensure_list, [vol.In(SENSOR_LOCALES)]),
+    vol.Inclusive(CONF_CITY, 'city'): cv.string,
+    vol.Inclusive(CONF_COUNTRY, 'city'): cv.string,
+    vol.Inclusive(CONF_LATITUDE, 'coords'): cv.latitude,
+    vol.Inclusive(CONF_LONGITUDE, 'coords'): cv.longitude,
+    vol.Optional(CONF_SHOW_ON_MAP, default=True): cv.boolean,
+    vol.Inclusive(CONF_STATE, 'city'): cv.string,
+    vol.Optional(CONF_SCAN_INTERVAL, default=DEFAULT_SCAN_INTERVAL):
+        cv.time_period
+})
+
+
+async def async_setup_platform(
+        hass, config, async_add_entities, discovery_info=None):
+    """Configure the platform and add the sensors."""
+    from pyairvisual import Client
+
+    city = config.get(CONF_CITY)
+    state = config.get(CONF_STATE)
+    country = config.get(CONF_COUNTRY)
+
+    latitude = config.get(CONF_LATITUDE, hass.config.latitude)
+    longitude = config.get(CONF_LONGITUDE, hass.config.longitude)
+
+    websession = aiohttp_client.async_get_clientsession(hass)
+
+    if city and state and country:
+        _LOGGER.debug(
+            "Using city, state, and country: %s, %s, %s", city, state, country)
+        location_id = ','.join((city, state, country))
+        data = AirVisualData(
+            Client(websession, api_key=config[CONF_API_KEY]),
+            city=city,
+            state=state,
+            country=country,
+            show_on_map=config[CONF_SHOW_ON_MAP],
+            scan_interval=config[CONF_SCAN_INTERVAL])
+    else:
+        _LOGGER.debug(
+            "Using latitude and longitude: %s, %s", latitude, longitude)
+        location_id = ','.join((str(latitude), str(longitude)))
+        data = AirVisualData(
+            Client(websession, api_key=config[CONF_API_KEY]),
+            latitude=latitude,
+            longitude=longitude,
+            show_on_map=config[CONF_SHOW_ON_MAP],
+            scan_interval=config[CONF_SCAN_INTERVAL])
+
+    await data.async_update()
+
+    sensors = []
+    for locale in config[CONF_MONITORED_CONDITIONS]:
+        for kind, name, icon, unit in SENSORS:
+            sensors.append(
+                AirVisualSensor(
+                    data, kind, name, icon, unit, locale, location_id))
+
+    async_add_entities(sensors, True)
+
+
+class AirVisualSensor(Entity):
+    """Define an AirVisual sensor."""
+
+    def __init__(self, airvisual, kind, name, icon, unit, locale, location_id):
+        """Initialize."""
+        self._attrs = {ATTR_ATTRIBUTION: DEFAULT_ATTRIBUTION}
+        self._icon = icon
+        self._locale = locale
+        self._location_id = location_id
+        self._name = name
+        self._state = None
+        self._type = kind
+        self._unit = unit
+        self.airvisual = airvisual
+
+    @property
+    def device_state_attributes(self):
+        """Return the device state attributes."""
+        if self.airvisual.show_on_map:
+            self._attrs[ATTR_LATITUDE] = self.airvisual.latitude
+            self._attrs[ATTR_LONGITUDE] = self.airvisual.longitude
+        else:
+            self._attrs['lati'] = self.airvisual.latitude
+            self._attrs['long'] = self.airvisual.longitude
+
+        return self._attrs
+
+    @property
+    def available(self):
+        """Return True if entity is available."""
+        return bool(self.airvisual.pollution_info)
+
+    @property
+    def icon(self):
+        """Return the icon."""
+        return self._icon
+
+    @property
+    def name(self):
+        """Return the name."""
+        return '{0} {1}'.format(SENSOR_LOCALES[self._locale], self._name)
+
+    @property
+    def state(self):
+        """Return the state."""
+        return self._state
+
+    @property
+    def unique_id(self):
+        """Return a unique, HASS-friendly identifier for this entity."""
+        return '{0}_{1}_{2}'.format(
+            self._location_id, self._locale, self._type)
+
+    @property
+    def unit_of_measurement(self):
+        """Return the unit the value is expressed in."""
+        return self._unit
+
+    async def async_update(self):
+        """Update the sensor."""
+        await self.airvisual.async_update()
+        data = self.airvisual.pollution_info
+
+        if not data:
+            return
+
+        if self._type == SENSOR_TYPE_LEVEL:
+            aqi = data['aqi{0}'.format(self._locale)]
+            [level] = [
+                i for i in POLLUTANT_LEVEL_MAPPING
+                if i['minimum'] <= aqi <= i['maximum']
+            ]
+            self._state = level['label']
+            self._icon = level['icon']
+        elif self._type == SENSOR_TYPE_AQI:
+            self._state = data['aqi{0}'.format(self._locale)]
+        elif self._type == SENSOR_TYPE_POLLUTANT:
+            symbol = data['main{0}'.format(self._locale)]
+            self._state = POLLUTANT_MAPPING[symbol]['label']
+            self._attrs.update({
+                ATTR_POLLUTANT_SYMBOL: symbol,
+                ATTR_POLLUTANT_UNIT: POLLUTANT_MAPPING[symbol]['unit']
+            })
+
+
+class AirVisualData:
+    """Define an object to hold sensor data."""
+
+    def __init__(self, client, **kwargs):
+        """Initialize."""
+        self._client = client
+        self.city = kwargs.get(CONF_CITY)
+        self.country = kwargs.get(CONF_COUNTRY)
+        self.latitude = kwargs.get(CONF_LATITUDE)
+        self.longitude = kwargs.get(CONF_LONGITUDE)
+        self.pollution_info = {}
+        self.show_on_map = kwargs.get(CONF_SHOW_ON_MAP)
+        self.state = kwargs.get(CONF_STATE)
+
+        self.async_update = Throttle(
+            kwargs[CONF_SCAN_INTERVAL])(self._async_update)
+
+    async def _async_update(self):
+        """Update AirVisual data."""
+        from pyairvisual.errors import AirVisualError
+
+        try:
+            if self.city and self.state and self.country:
+                resp = await self._client.api.city(
+                    self.city, self.state, self.country)
+                self.longitude, self.latitude = resp['location']['coordinates']
+            else:
+                resp = await self._client.api.nearest_city(
+                    self.latitude, self.longitude)
+
+            _LOGGER.debug("New data retrieved: %s", resp)
+
+            self.pollution_info = resp['current']['pollution']
+        except (KeyError, AirVisualError) as err:
+            if self.city and self.state and self.country:
+                location = (self.city, self.state, self.country)
+            else:
+                location = (self.latitude, self.longitude)
+
+            _LOGGER.error(
+                "Can't retrieve data for location: %s (%s)", location,
+                err)
+            self.pollution_info = {}

homeassistant/components/aladdin_connect/__init__.py

@@ -0,0 +1 @@
+"""The aladdin_connect component."""

homeassistant/components/aladdin_connect/cover.py

@@ -0,0 +1,113 @@
+"""Platform for the Aladdin Connect cover component."""
+import logging
+
+import voluptuous as vol
+
+from homeassistant.components.cover import (CoverDevice, PLATFORM_SCHEMA,
+                                            SUPPORT_OPEN, SUPPORT_CLOSE)
+from homeassistant.const import (CONF_USERNAME, CONF_PASSWORD, STATE_CLOSED,
+                                 STATE_OPENING, STATE_CLOSING, STATE_OPEN)
+import homeassistant.helpers.config_validation as cv
+
+_LOGGER = logging.getLogger(__name__)
+
+NOTIFICATION_ID = 'aladdin_notification'
+NOTIFICATION_TITLE = 'Aladdin Connect Cover Setup'
+
+STATES_MAP = {
+    'open': STATE_OPEN,
+    'opening': STATE_OPENING,
+    'closed': STATE_CLOSED,
+    'closing': STATE_CLOSING
+}
+
+SUPPORTED_FEATURES = SUPPORT_OPEN | SUPPORT_CLOSE
+
+PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
+    vol.Required(CONF_USERNAME): cv.string,
+    vol.Required(CONF_PASSWORD): cv.string
+})
+
+
+def setup_platform(hass, config, add_entities, discovery_info=None):
+    """Set up the Aladdin Connect platform."""
+    from aladdin_connect import AladdinConnectClient
+
+    username = config.get(CONF_USERNAME)
+    password = config.get(CONF_PASSWORD)
+    acc = AladdinConnectClient(username, password)
+
+    try:
+        if not acc.login():
+            raise ValueError("Username or Password is incorrect")
+        add_entities(AladdinDevice(acc, door) for door in acc.get_doors())
+    except (TypeError, KeyError, NameError, ValueError) as ex:
+        _LOGGER.error("%s", ex)
+        hass.components.persistent_notification.create(
+            'Error: {}<br />'
+            'You will need to restart hass after fixing.'
+            ''.format(ex),
+            title=NOTIFICATION_TITLE,
+            notification_id=NOTIFICATION_ID)
+
+
+class AladdinDevice(CoverDevice):
+    """Representation of Aladdin Connect cover."""
+
+    def __init__(self, acc, device):
+        """Initialize the cover."""
+        self._acc = acc
+        self._device_id = device['device_id']
+        self._number = device['door_number']
+        self._name = device['name']
+        self._status = STATES_MAP.get(device['status'])
+
+    @property
+    def device_class(self):
+        """Define this cover as a garage door."""
+        return 'garage'
+
+    @property
+    def supported_features(self):
+        """Flag supported features."""
+        return SUPPORTED_FEATURES
+
+    @property
+    def unique_id(self):
+        """Return a unique ID."""
+        return '{}-{}'.format(self._device_id, self._number)
+
+    @property
+    def name(self):
+        """Return the name of the garage door."""
+        return self._name
+
+    @property
+    def is_opening(self):
+        """Return if the cover is opening or not."""
+        return self._status == STATE_OPENING
+
+    @property
+    def is_closing(self):
+        """Return if the cover is closing or not."""
+        return self._status == STATE_CLOSING
+
+    @property
+    def is_closed(self):
+        """Return None if status is unknown, True if closed, else False."""
+        if self._status is None:
+            return None
+        return self._status == STATE_CLOSED
+
+    def close_cover(self, **kwargs):
+        """Issue close command to cover."""
+        self._acc.close_door(self._device_id, self._number)
+
+    def open_cover(self, **kwargs):
+        """Issue open command to cover."""
+        self._acc.open_door(self._device_id, self._number)
+
+    def update(self):
+        """Update status of cover."""
+        acc_status = self._acc.get_door_status(self._device_id, self._number)
+        self._status = STATES_MAP.get(acc_status)

homeassistant/components/aladdin_connect/manifest.json

@@ -0,0 +1,10 @@
+{
+  "domain": "aladdin_connect",
+  "name": "Aladdin connect",
+  "documentation": "https://www.home-assistant.io/components/aladdin_connect",
+  "requirements": [
+    "aladdin_connect==0.3"
+  ],
+  "dependencies": [],
+  "codeowners": []
+}

homeassistant/components/alarm_control_panel/__init__.py

@@ -1,10 +1,4 @@
-"""
-Component to interface with an alarm control panel.
-
-For more details about this platform, please refer to the documentation at
-https://home-assistant.io/components/alarm_control_panel/
-"""
-import asyncio
+"""Component to interface with an alarm control panel."""
 from datetime import timedelta
 import logging
 
@@ -14,8 +8,8 @@ from homeassistant.const import (
     ATTR_CODE, ATTR_CODE_FORMAT, ATTR_ENTITY_ID, SERVICE_ALARM_TRIGGER,
     SERVICE_ALARM_DISARM, SERVICE_ALARM_ARM_HOME, SERVICE_ALARM_ARM_AWAY,
     SERVICE_ALARM_ARM_NIGHT, SERVICE_ALARM_ARM_CUSTOM_BYPASS)
-from homeassistant.loader import bind_hass
-from homeassistant.helpers.config_validation import PLATFORM_SCHEMA  # noqa
+from homeassistant.helpers.config_validation import (  # noqa
+    PLATFORM_SCHEMA, PLATFORM_SCHEMA_BASE)
 import homeassistant.helpers.config_validation as cv
 from homeassistant.helpers.entity import Entity
 from homeassistant.helpers.entity_component import EntityComponent
@@ -23,94 +17,23 @@ from homeassistant.helpers.entity_component import EntityComponent
 DOMAIN = 'alarm_control_panel'
 SCAN_INTERVAL = timedelta(seconds=30)
 ATTR_CHANGED_BY = 'changed_by'
+FORMAT_TEXT = 'text'
+FORMAT_NUMBER = 'number'
 
 ENTITY_ID_FORMAT = DOMAIN + '.{}'
 
 ALARM_SERVICE_SCHEMA = vol.Schema({
-    vol.Optional(ATTR_ENTITY_ID): cv.entity_ids,
+    vol.Optional(ATTR_ENTITY_ID): cv.comp_entity_ids,
     vol.Optional(ATTR_CODE): cv.string,
 })
 
 
-@bind_hass
-def alarm_disarm(hass, code=None, entity_id=None):
-    """Send the alarm the command for disarm."""
-    data = {}
-    if code:
-        data[ATTR_CODE] = code
-    if entity_id:
-        data[ATTR_ENTITY_ID] = entity_id
-
-    hass.services.call(DOMAIN, SERVICE_ALARM_DISARM, data)
-
-
-@bind_hass
-def alarm_arm_home(hass, code=None, entity_id=None):
-    """Send the alarm the command for arm home."""
-    data = {}
-    if code:
-        data[ATTR_CODE] = code
-    if entity_id:
-        data[ATTR_ENTITY_ID] = entity_id
-
-    hass.services.call(DOMAIN, SERVICE_ALARM_ARM_HOME, data)
-
-
-@bind_hass
-def alarm_arm_away(hass, code=None, entity_id=None):
-    """Send the alarm the command for arm away."""
-    data = {}
-    if code:
-        data[ATTR_CODE] = code
-    if entity_id:
-        data[ATTR_ENTITY_ID] = entity_id
-
-    hass.services.call(DOMAIN, SERVICE_ALARM_ARM_AWAY, data)
-
-
-@bind_hass
-def alarm_arm_night(hass, code=None, entity_id=None):
-    """Send the alarm the command for arm night."""
-    data = {}
-    if code:
-        data[ATTR_CODE] = code
-    if entity_id:
-        data[ATTR_ENTITY_ID] = entity_id
-
-    hass.services.call(DOMAIN, SERVICE_ALARM_ARM_NIGHT, data)
-
-
-@bind_hass
-def alarm_trigger(hass, code=None, entity_id=None):
-    """Send the alarm the command for trigger."""
-    data = {}
-    if code:
-        data[ATTR_CODE] = code
-    if entity_id:
-        data[ATTR_ENTITY_ID] = entity_id
-
-    hass.services.call(DOMAIN, SERVICE_ALARM_TRIGGER, data)
-
-
-@bind_hass
-def alarm_arm_custom_bypass(hass, code=None, entity_id=None):
-    """Send the alarm the command for arm custom bypass."""
-    data = {}
-    if code:
-        data[ATTR_CODE] = code
-    if entity_id:
-        data[ATTR_ENTITY_ID] = entity_id
-
-    hass.services.call(DOMAIN, SERVICE_ALARM_ARM_CUSTOM_BYPASS, data)
-
-
-@asyncio.coroutine
-def async_setup(hass, config):
+async def async_setup(hass, config):
     """Track states and offer events for sensors."""
     component = hass.data[DOMAIN] = EntityComponent(
         logging.getLogger(__name__), DOMAIN, hass, SCAN_INTERVAL)
 
-    yield from component.async_setup(config)
+    await component.async_setup(config)
 
     component.async_register_entity_service(
         SERVICE_ALARM_DISARM, ALARM_SERVICE_SCHEMA,

homeassistant/components/alarm_control_panel/abode.py

@@ -1,85 +0,0 @@
-"""
-This component provides HA alarm_control_panel support for Abode System.
-
-For more details about this platform, please refer to the documentation at
-https://home-assistant.io/components/alarm_control_panel.abode/
-"""
-import logging
-
-from homeassistant.components.abode import CONF_ATTRIBUTION, AbodeDevice
-from homeassistant.components.abode import DOMAIN as ABODE_DOMAIN
-from homeassistant.components.alarm_control_panel import AlarmControlPanel
-from homeassistant.const import (
-    ATTR_ATTRIBUTION, STATE_ALARM_ARMED_AWAY, STATE_ALARM_ARMED_HOME,
-    STATE_ALARM_DISARMED)
-
-DEPENDENCIES = ['abode']
-
-_LOGGER = logging.getLogger(__name__)
-
-ICON = 'mdi:security'
-
-
-def setup_platform(hass, config, add_entities, discovery_info=None):
-    """Set up an alarm control panel for an Abode device."""
-    data = hass.data[ABODE_DOMAIN]
-
-    alarm_devices = [AbodeAlarm(data, data.abode.get_alarm(), data.name)]
-
-    data.devices.extend(alarm_devices)
-
-    add_entities(alarm_devices)
-
-
-class AbodeAlarm(AbodeDevice, AlarmControlPanel):
-    """An alarm_control_panel implementation for Abode."""
-
-    def __init__(self, data, device, name):
-        """Initialize the alarm control panel."""
-        super().__init__(data, device)
-        self._name = name
-
-    @property
-    def icon(self):
-        """Return the icon."""
-        return ICON
-
-    @property
-    def state(self):
-        """Return the state of the device."""
-        if self._device.is_standby:
-            state = STATE_ALARM_DISARMED
-        elif self._device.is_away:
-            state = STATE_ALARM_ARMED_AWAY
-        elif self._device.is_home:
-            state = STATE_ALARM_ARMED_HOME
-        else:
-            state = None
-        return state
-
-    def alarm_disarm(self, code=None):
-        """Send disarm command."""
-        self._device.set_standby()
-
-    def alarm_arm_home(self, code=None):
-        """Send arm home command."""
-        self._device.set_home()
-
-    def alarm_arm_away(self, code=None):
-        """Send arm away command."""
-        self._device.set_away()
-
-    @property
-    def name(self):
-        """Return the name of the alarm."""
-        return self._name or super().name
-
-    @property
-    def device_state_attributes(self):
-        """Return the state attributes."""
-        return {
-            ATTR_ATTRIBUTION: CONF_ATTRIBUTION,
-            'device_id': self._device.device_id,
-            'battery_backup': self._device.battery,
-            'cellular_backup': self._device.is_cellular,
-        }

homeassistant/components/alarm_control_panel/alarmdecoder.py

@@ -1,144 +0,0 @@
-"""
-Support for AlarmDecoder-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.alarmdecoder/
-"""
-import asyncio
-import logging
-
-import voluptuous as vol
-
-import homeassistant.components.alarm_control_panel as alarm
-from homeassistant.components.alarmdecoder import DATA_AD, SIGNAL_PANEL_MESSAGE
-from homeassistant.const import (
-    ATTR_CODE, STATE_ALARM_ARMED_AWAY, STATE_ALARM_ARMED_HOME,
-    STATE_ALARM_DISARMED, STATE_ALARM_TRIGGERED)
-import homeassistant.helpers.config_validation as cv
-
-_LOGGER = logging.getLogger(__name__)
-
-DEPENDENCIES = ['alarmdecoder']
-
-SERVICE_ALARM_TOGGLE_CHIME = 'alarmdecoder_alarm_toggle_chime'
-ALARM_TOGGLE_CHIME_SCHEMA = vol.Schema({
-    vol.Required(ATTR_CODE): cv.string,
-})
-
-
-def setup_platform(hass, config, add_entities, discovery_info=None):
-    """Set up for AlarmDecoder alarm panels."""
-    device = AlarmDecoderAlarmPanel()
-    add_entities([device])
-
-    def alarm_toggle_chime_handler(service):
-        """Register toggle chime handler."""
-        code = service.data.get(ATTR_CODE)
-        device.alarm_toggle_chime(code)
-
-    hass.services.register(
-        alarm.DOMAIN, SERVICE_ALARM_TOGGLE_CHIME, alarm_toggle_chime_handler,
-        schema=ALARM_TOGGLE_CHIME_SCHEMA)
-
-
-class AlarmDecoderAlarmPanel(alarm.AlarmControlPanel):
-    """Representation of an AlarmDecoder-based alarm panel."""
-
-    def __init__(self):
-        """Initialize the alarm panel."""
-        self._display = ""
-        self._name = "Alarm Panel"
-        self._state = None
-        self._ac_power = None
-        self._backlight_on = None
-        self._battery_low = None
-        self._check_zone = None
-        self._chime = None
-        self._entry_delay_off = None
-        self._programming_mode = None
-        self._ready = None
-        self._zone_bypassed = None
-
-    @asyncio.coroutine
-    def async_added_to_hass(self):
-        """Register callbacks."""
-        self.hass.helpers.dispatcher.async_dispatcher_connect(
-            SIGNAL_PANEL_MESSAGE, self._message_callback)
-
-    def _message_callback(self, message):
-        """Handle received messages."""
-        if message.alarm_sounding or message.fire_alarm:
-            self._state = STATE_ALARM_TRIGGERED
-        elif message.armed_away:
-            self._state = STATE_ALARM_ARMED_AWAY
-        elif message.armed_home:
-            self._state = STATE_ALARM_ARMED_HOME
-        else:
-            self._state = STATE_ALARM_DISARMED
-
-        self._ac_power = message.ac_power
-        self._backlight_on = message.backlight_on
-        self._battery_low = message.battery_low
-        self._check_zone = message.check_zone
-        self._chime = message.chime_on
-        self._entry_delay_off = message.entry_delay_off
-        self._programming_mode = message.programming_mode
-        self._ready = message.ready
-        self._zone_bypassed = message.zone_bypassed
-
-        self.schedule_update_ha_state()
-
-    @property
-    def name(self):
-        """Return the name of the device."""
-        return self._name
-
-    @property
-    def should_poll(self):
-        """Return the polling state."""
-        return False
-
-    @property
-    def code_format(self):
-        """Return one or more digits/characters."""
-        return 'Number'
-
-    @property
-    def state(self):
-        """Return the state of the device."""
-        return self._state
-
-    @property
-    def device_state_attributes(self):
-        """Return the state attributes."""
-        return {
-            'ac_power': self._ac_power,
-            'backlight_on': self._backlight_on,
-            'battery_low': self._battery_low,
-            'check_zone': self._check_zone,
-            'chime': self._chime,
-            'entry_delay_off': self._entry_delay_off,
-            'programming_mode': self._programming_mode,
-            'ready': self._ready,
-            'zone_bypassed': self._zone_bypassed,
-        }
-
-    def alarm_disarm(self, code=None):
-        """Send disarm command."""
-        if code:
-            self.hass.data[DATA_AD].send("{!s}1".format(code))
-
-    def alarm_arm_away(self, code=None):
-        """Send arm away command."""
-        if code:
-            self.hass.data[DATA_AD].send("{!s}2".format(code))
-
-    def alarm_arm_home(self, code=None):
-        """Send arm home command."""
-        if code:
-            self.hass.data[DATA_AD].send("{!s}3".format(code))
-
-    def alarm_toggle_chime(self, code=None):
-        """Send toggle chime command."""
-        if code:
-            self.hass.data[DATA_AD].send("{!s}9".format(code))

homeassistant/components/alarm_control_panel/alarmdotcom.py

@@ -1,132 +0,0 @@
-"""
-Interfaces with Alarm.com alarm control panels.
-
-For more details about this platform, please refer to the documentation at
-https://home-assistant.io/components/alarm_control_panel.alarmdotcom/
-"""
-import asyncio
-import logging
-import re
-
-import voluptuous as vol
-
-import homeassistant.components.alarm_control_panel as alarm
-from homeassistant.components.alarm_control_panel import PLATFORM_SCHEMA
-from homeassistant.const import (
-    CONF_CODE, CONF_NAME, CONF_PASSWORD, CONF_USERNAME, STATE_ALARM_ARMED_AWAY,
-    STATE_ALARM_ARMED_HOME, STATE_ALARM_DISARMED, STATE_UNKNOWN)
-from homeassistant.helpers.aiohttp_client import async_get_clientsession
-import homeassistant.helpers.config_validation as cv
-
-REQUIREMENTS = ['pyalarmdotcom==0.3.2']
-
-_LOGGER = logging.getLogger(__name__)
-
-DEFAULT_NAME = 'Alarm.com'
-
-PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
-    vol.Required(CONF_PASSWORD): cv.string,
-    vol.Required(CONF_USERNAME): cv.string,
-    vol.Optional(CONF_CODE): cv.positive_int,
-    vol.Optional(CONF_NAME, default=DEFAULT_NAME): cv.string,
-})
-
-
-@asyncio.coroutine
-def async_setup_platform(hass, config, async_add_entities,
-                         discovery_info=None):
-    """Set up a Alarm.com control panel."""
-    name = config.get(CONF_NAME)
-    code = config.get(CONF_CODE)
-    username = config.get(CONF_USERNAME)
-    password = config.get(CONF_PASSWORD)
-
-    alarmdotcom = AlarmDotCom(hass, name, code, username, password)
-    yield from alarmdotcom.async_login()
-    async_add_entities([alarmdotcom])
-
-
-class AlarmDotCom(alarm.AlarmControlPanel):
-    """Representation of an Alarm.com status."""
-
-    def __init__(self, hass, name, code, username, password):
-        """Initialize the Alarm.com status."""
-        from pyalarmdotcom import Alarmdotcom
-        _LOGGER.debug('Setting up Alarm.com...')
-        self._hass = hass
-        self._name = name
-        self._code = str(code) if code else None
-        self._username = username
-        self._password = password
-        self._websession = async_get_clientsession(self._hass)
-        self._state = STATE_UNKNOWN
-        self._alarm = Alarmdotcom(
-            username, password, self._websession, hass.loop)
-
-    @asyncio.coroutine
-    def async_login(self):
-        """Login to Alarm.com."""
-        yield from self._alarm.async_login()
-
-    @asyncio.coroutine
-    def async_update(self):
-        """Fetch the latest state."""
-        yield from self._alarm.async_update()
-        return self._alarm.state
-
-    @property
-    def name(self):
-        """Return the name of the alarm."""
-        return self._name
-
-    @property
-    def code_format(self):
-        """Return one or more digits/characters."""
-        if self._code is None:
-            return None
-        if isinstance(self._code, str) and re.search('^\\d+$', self._code):
-            return 'Number'
-        return 'Any'
-
-    @property
-    def state(self):
-        """Return the state of the device."""
-        if self._alarm.state.lower() == 'disarmed':
-            return STATE_ALARM_DISARMED
-        if self._alarm.state.lower() == 'armed stay':
-            return STATE_ALARM_ARMED_HOME
-        if self._alarm.state.lower() == 'armed away':
-            return STATE_ALARM_ARMED_AWAY
-        return STATE_UNKNOWN
-
-    @property
-    def device_state_attributes(self):
-        """Return the state attributes."""
-        return {
-            'sensor_status': self._alarm.sensor_status
-        }
-
-    @asyncio.coroutine
-    def async_alarm_disarm(self, code=None):
-        """Send disarm command."""
-        if self._validate_code(code):
-            yield from self._alarm.async_alarm_disarm()
-
-    @asyncio.coroutine
-    def async_alarm_arm_home(self, code=None):
-        """Send arm hom command."""
-        if self._validate_code(code):
-            yield from self._alarm.async_alarm_arm_home()
-
-    @asyncio.coroutine
-    def async_alarm_arm_away(self, code=None):
-        """Send arm away command."""
-        if self._validate_code(code):
-            yield from self._alarm.async_alarm_arm_away()
-
-    def _validate_code(self, code):
-        """Validate given code."""
-        check = self._code is None or code == self._code
-        if not check:
-            _LOGGER.warning("Wrong code entered")
-        return check

homeassistant/components/alarm_control_panel/arlo.py

@@ -1,131 +0,0 @@
-"""
-Support for Arlo Alarm Control Panels.
-
-For more details about this platform, please refer to the documentation at
-https://home-assistant.io/components/alarm_control_panel.arlo/
-"""
-import logging
-
-import voluptuous as vol
-
-import homeassistant.helpers.config_validation as cv
-from homeassistant.core import callback
-from homeassistant.helpers.dispatcher import async_dispatcher_connect
-from homeassistant.components.alarm_control_panel import (
-    AlarmControlPanel, PLATFORM_SCHEMA)
-from homeassistant.components.arlo import (
-    DATA_ARLO, CONF_ATTRIBUTION, SIGNAL_UPDATE_ARLO)
-from homeassistant.const import (
-    ATTR_ATTRIBUTION, STATE_ALARM_ARMED_AWAY, STATE_ALARM_ARMED_HOME,
-    STATE_ALARM_DISARMED)
-
-_LOGGER = logging.getLogger(__name__)
-
-ARMED = 'armed'
-
-CONF_HOME_MODE_NAME = 'home_mode_name'
-CONF_AWAY_MODE_NAME = 'away_mode_name'
-
-DEPENDENCIES = ['arlo']
-
-DISARMED = 'disarmed'
-
-ICON = 'mdi:security'
-
-PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
-    vol.Optional(CONF_HOME_MODE_NAME, default=ARMED): cv.string,
-    vol.Optional(CONF_AWAY_MODE_NAME, default=ARMED): cv.string,
-})
-
-
-def setup_platform(hass, config, add_entities, discovery_info=None):
-    """Set up the Arlo Alarm Control Panels."""
-    arlo = hass.data[DATA_ARLO]
-
-    if not arlo.base_stations:
-        return
-
-    home_mode_name = config.get(CONF_HOME_MODE_NAME)
-    away_mode_name = config.get(CONF_AWAY_MODE_NAME)
-    base_stations = []
-    for base_station in arlo.base_stations:
-        base_stations.append(ArloBaseStation(base_station, home_mode_name,
-                                             away_mode_name))
-    add_entities(base_stations, True)
-
-
-class ArloBaseStation(AlarmControlPanel):
-    """Representation of an Arlo Alarm Control Panel."""
-
-    def __init__(self, data, home_mode_name, away_mode_name):
-        """Initialize the alarm control panel."""
-        self._base_station = data
-        self._home_mode_name = home_mode_name
-        self._away_mode_name = away_mode_name
-        self._state = None
-
-    @property
-    def icon(self):
-        """Return icon."""
-        return ICON
-
-    async def async_added_to_hass(self):
-        """Register callbacks."""
-        async_dispatcher_connect(
-            self.hass, SIGNAL_UPDATE_ARLO, self._update_callback)
-
-    @callback
-    def _update_callback(self):
-        """Call update method."""
-        self.async_schedule_update_ha_state(True)
-
-    @property
-    def state(self):
-        """Return the state of the device."""
-        return self._state
-
-    def update(self):
-        """Update the state of the device."""
-        _LOGGER.debug("Updating Arlo Alarm Control Panel %s", self.name)
-        mode = self._base_station.mode
-        if mode:
-            self._state = self._get_state_from_mode(mode)
-        else:
-            self._state = None
-
-    async def async_alarm_disarm(self, code=None):
-        """Send disarm command."""
-        self._base_station.mode = DISARMED
-
-    async def async_alarm_arm_away(self, code=None):
-        """Send arm away command. Uses custom mode."""
-        self._base_station.mode = self._away_mode_name
-
-    async def async_alarm_arm_home(self, code=None):
-        """Send arm home command. Uses custom mode."""
-        self._base_station.mode = self._home_mode_name
-
-    @property
-    def name(self):
-        """Return the name of the base station."""
-        return self._base_station.name
-
-    @property
-    def device_state_attributes(self):
-        """Return the state attributes."""
-        return {
-            ATTR_ATTRIBUTION: CONF_ATTRIBUTION,
-            'device_id': self._base_station.device_id
-        }
-
-    def _get_state_from_mode(self, mode):
-        """Convert Arlo mode to Home Assistant state."""
-        if mode == ARMED:
-            return STATE_ALARM_ARMED_AWAY
-        if mode == DISARMED:
-            return STATE_ALARM_DISARMED
-        if mode == self._home_mode_name:
-            return STATE_ALARM_ARMED_HOME
-        if mode == self._away_mode_name:
-            return STATE_ALARM_ARMED_AWAY
-        return mode

homeassistant/components/alarm_control_panel/canary.py

@@ -1,91 +0,0 @@
-"""
-Support for Canary alarm.
-
-For more details about this platform, please refer to the documentation at
-https://home-assistant.io/components/alarm_control_panel.canary/
-"""
-import logging
-
-from homeassistant.components.alarm_control_panel import AlarmControlPanel
-from homeassistant.components.canary import DATA_CANARY
-from homeassistant.const import STATE_ALARM_DISARMED, STATE_ALARM_ARMED_AWAY, \
-    STATE_ALARM_ARMED_NIGHT, STATE_ALARM_ARMED_HOME
-
-DEPENDENCIES = ['canary']
-
-_LOGGER = logging.getLogger(__name__)
-
-
-def setup_platform(hass, config, add_entities, discovery_info=None):
-    """Set up the Canary alarms."""
-    data = hass.data[DATA_CANARY]
-    devices = []
-
-    for location in data.locations:
-        devices.append(CanaryAlarm(data, location.location_id))
-
-    add_entities(devices, True)
-
-
-class CanaryAlarm(AlarmControlPanel):
-    """Representation of a Canary alarm control panel."""
-
-    def __init__(self, data, location_id):
-        """Initialize a Canary security camera."""
-        self._data = data
-        self._location_id = location_id
-
-    @property
-    def name(self):
-        """Return the name of the alarm."""
-        location = self._data.get_location(self._location_id)
-        return location.name
-
-    @property
-    def state(self):
-        """Return the state of the device."""
-        from canary.api import LOCATION_MODE_AWAY, LOCATION_MODE_HOME, \
-            LOCATION_MODE_NIGHT
-
-        location = self._data.get_location(self._location_id)
-
-        if location.is_private:
-            return STATE_ALARM_DISARMED
-
-        mode = location.mode
-        if mode.name == LOCATION_MODE_AWAY:
-            return STATE_ALARM_ARMED_AWAY
-        if mode.name == LOCATION_MODE_HOME:
-            return STATE_ALARM_ARMED_HOME
-        if mode.name == LOCATION_MODE_NIGHT:
-            return STATE_ALARM_ARMED_NIGHT
-        return None
-
-    @property
-    def device_state_attributes(self):
-        """Return the state attributes."""
-        location = self._data.get_location(self._location_id)
-        return {
-            'private': location.is_private
-        }
-
-    def alarm_disarm(self, code=None):
-        """Send disarm command."""
-        location = self._data.get_location(self._location_id)
-        self._data.set_location_mode(self._location_id, location.mode.name,
-                                     True)
-
-    def alarm_arm_home(self, code=None):
-        """Send arm home command."""
-        from canary.api import LOCATION_MODE_HOME
-        self._data.set_location_mode(self._location_id, LOCATION_MODE_HOME)
-
-    def alarm_arm_away(self, code=None):
-        """Send arm away command."""
-        from canary.api import LOCATION_MODE_AWAY
-        self._data.set_location_mode(self._location_id, LOCATION_MODE_AWAY)
-
-    def alarm_arm_night(self, code=None):
-        """Send arm night command."""
-        from canary.api import LOCATION_MODE_NIGHT
-        self._data.set_location_mode(self._location_id, LOCATION_MODE_NIGHT)

homeassistant/components/alarm_control_panel/concord232.py

@@ -1,124 +0,0 @@
-"""
-Support for Concord232 alarm control panels.
-
-For more details about this platform, please refer to the documentation at
-https://home-assistant.io/components/alarm_control_panel.concord232/
-"""
-import datetime
-from datetime import timedelta
-import logging
-
-import requests
-import voluptuous as vol
-
-import homeassistant.components.alarm_control_panel as alarm
-from homeassistant.components.alarm_control_panel import PLATFORM_SCHEMA
-from homeassistant.const import (
-    CONF_HOST, CONF_NAME, CONF_PORT, STATE_ALARM_ARMED_AWAY,
-    STATE_ALARM_ARMED_HOME, STATE_ALARM_DISARMED, STATE_UNKNOWN)
-import homeassistant.helpers.config_validation as cv
-
-REQUIREMENTS = ['concord232==0.15']
-
-_LOGGER = logging.getLogger(__name__)
-
-DEFAULT_HOST = 'localhost'
-DEFAULT_NAME = 'CONCORD232'
-DEFAULT_PORT = 5007
-
-SCAN_INTERVAL = timedelta(seconds=10)
-
-PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
-    vol.Optional(CONF_HOST, default=DEFAULT_HOST): cv.string,
-    vol.Optional(CONF_NAME, default=DEFAULT_NAME): cv.string,
-    vol.Optional(CONF_PORT, default=DEFAULT_PORT): cv.port,
-})
-
-
-def setup_platform(hass, config, add_entities, discovery_info=None):
-    """Set up the Concord232 alarm control panel platform."""
-    name = config.get(CONF_NAME)
-    host = config.get(CONF_HOST)
-    port = config.get(CONF_PORT)
-
-    url = 'http://{}:{}'.format(host, port)
-
-    try:
-        add_entities([Concord232Alarm(hass, url, name)])
-    except requests.exceptions.ConnectionError as ex:
-        _LOGGER.error("Unable to connect to Concord232: %s", str(ex))
-        return
-
-
-class Concord232Alarm(alarm.AlarmControlPanel):
-    """Representation of the Concord232-based alarm panel."""
-
-    def __init__(self, hass, url, name):
-        """Initialize the Concord232 alarm panel."""
-        from concord232 import client as concord232_client
-
-        self._state = STATE_UNKNOWN
-        self._hass = hass
-        self._name = name
-        self._url = url
-
-        try:
-            client = concord232_client.Client(self._url)
-        except requests.exceptions.ConnectionError as ex:
-            _LOGGER.error("Unable to connect to Concord232: %s", str(ex))
-
-        self._alarm = client
-        self._alarm.partitions = self._alarm.list_partitions()
-        self._alarm.last_partition_update = datetime.datetime.now()
-        self.update()
-
-    @property
-    def name(self):
-        """Return the name of the device."""
-        return self._name
-
-    @property
-    def code_format(self):
-        """Return the characters if code is defined."""
-        return 'Number'
-
-    @property
-    def state(self):
-        """Return the state of the device."""
-        return self._state
-
-    def update(self):
-        """Update values from API."""
-        try:
-            part = self._alarm.list_partitions()[0]
-        except requests.exceptions.ConnectionError as ex:
-            _LOGGER.error("Unable to connect to %(host)s: %(reason)s",
-                          dict(host=self._url, reason=ex))
-            newstate = STATE_UNKNOWN
-        except IndexError:
-            _LOGGER.error("Concord232 reports no partitions")
-            newstate = STATE_UNKNOWN
-
-        if part['arming_level'] == 'Off':
-            newstate = STATE_ALARM_DISARMED
-        elif 'Home' in part['arming_level']:
-            newstate = STATE_ALARM_ARMED_HOME
-        else:
-            newstate = STATE_ALARM_ARMED_AWAY
-
-        if not newstate == self._state:
-            _LOGGER.info("State change from %s to %s", self._state, newstate)
-            self._state = newstate
-        return self._state
-
-    def alarm_disarm(self, code=None):
-        """Send disarm command."""
-        self._alarm.disarm(code)
-
-    def alarm_arm_home(self, code=None):
-        """Send arm home command."""
-        self._alarm.arm('stay')
-
-    def alarm_arm_away(self, code=None):
-        """Send arm away command."""
-        self._alarm.arm('away')

homeassistant/components/alarm_control_panel/demo.py

@@ -1,48 +0,0 @@
-"""
-Demo platform that has two fake alarm control panels.
-
-For more details about this platform, please refer to the documentation
-https://home-assistant.io/components/demo/
-"""
-import datetime
-from homeassistant.components.alarm_control_panel import manual
-from homeassistant.const import (
-    STATE_ALARM_ARMED_AWAY, STATE_ALARM_ARMED_CUSTOM_BYPASS,
-    STATE_ALARM_ARMED_HOME, STATE_ALARM_ARMED_NIGHT,
-    STATE_ALARM_DISARMED, STATE_ALARM_TRIGGERED, CONF_DELAY_TIME,
-    CONF_PENDING_TIME, CONF_TRIGGER_TIME)
-
-
-def setup_platform(hass, config, add_entities, discovery_info=None):
-    """Set up the Demo alarm control panel platform."""
-    add_entities([
-        manual.ManualAlarm(hass, 'Alarm', '1234', None, False, {
-            STATE_ALARM_ARMED_AWAY: {
-                CONF_DELAY_TIME: datetime.timedelta(seconds=0),
-                CONF_PENDING_TIME: datetime.timedelta(seconds=5),
-                CONF_TRIGGER_TIME: datetime.timedelta(seconds=10),
-            },
-            STATE_ALARM_ARMED_HOME: {
-                CONF_DELAY_TIME: datetime.timedelta(seconds=0),
-                CONF_PENDING_TIME: datetime.timedelta(seconds=5),
-                CONF_TRIGGER_TIME: datetime.timedelta(seconds=10),
-            },
-            STATE_ALARM_ARMED_NIGHT: {
-                CONF_DELAY_TIME: datetime.timedelta(seconds=0),
-                CONF_PENDING_TIME: datetime.timedelta(seconds=5),
-                CONF_TRIGGER_TIME: datetime.timedelta(seconds=10),
-            },
-            STATE_ALARM_DISARMED: {
-                CONF_DELAY_TIME: datetime.timedelta(seconds=0),
-                CONF_TRIGGER_TIME: datetime.timedelta(seconds=10),
-            },
-            STATE_ALARM_ARMED_CUSTOM_BYPASS: {
-                CONF_DELAY_TIME: datetime.timedelta(seconds=0),
-                CONF_PENDING_TIME: datetime.timedelta(seconds=5),
-                CONF_TRIGGER_TIME: datetime.timedelta(seconds=10),
-            },
-            STATE_ALARM_TRIGGERED: {
-                CONF_PENDING_TIME: datetime.timedelta(seconds=5),
-            },
-        }),
-    ])

homeassistant/components/alarm_control_panel/egardia.py

@@ -1,144 +0,0 @@
-"""
-Interfaces with Egardia/Woonveilig alarm control panel.
-
-For more details about this platform, please refer to the documentation at
-https://home-assistant.io/components/alarm_control_panel.egardia/
-"""
-import asyncio
-import logging
-
-import requests
-
-import homeassistant.components.alarm_control_panel as alarm
-from homeassistant.const import (
-    STATE_ALARM_DISARMED, STATE_ALARM_ARMED_HOME,
-    STATE_ALARM_ARMED_AWAY, STATE_ALARM_TRIGGERED,
-    STATE_ALARM_ARMED_NIGHT)
-from homeassistant.components.egardia import (
-    EGARDIA_DEVICE, EGARDIA_SERVER,
-    REPORT_SERVER_CODES_IGNORE, CONF_REPORT_SERVER_CODES,
-    CONF_REPORT_SERVER_ENABLED, CONF_REPORT_SERVER_PORT
-    )
-DEPENDENCIES = ['egardia']
-
-_LOGGER = logging.getLogger(__name__)
-
-STATES = {
-    'ARM': STATE_ALARM_ARMED_AWAY,
-    'DAY HOME': STATE_ALARM_ARMED_HOME,
-    'DISARM': STATE_ALARM_DISARMED,
-    'ARMHOME': STATE_ALARM_ARMED_HOME,
-    'HOME': STATE_ALARM_ARMED_HOME,
-    'NIGHT HOME': STATE_ALARM_ARMED_NIGHT,
-    'TRIGGERED': STATE_ALARM_TRIGGERED
-}
-
-
-def setup_platform(hass, config, add_entities, discovery_info=None):
-    """Set up the Egardia platform."""
-    if discovery_info is None:
-        return
-    device = EgardiaAlarm(
-        discovery_info['name'],
-        hass.data[EGARDIA_DEVICE],
-        discovery_info[CONF_REPORT_SERVER_ENABLED],
-        discovery_info.get(CONF_REPORT_SERVER_CODES),
-        discovery_info[CONF_REPORT_SERVER_PORT])
-    # add egardia alarm device
-    add_entities([device], True)
-
-
-class EgardiaAlarm(alarm.AlarmControlPanel):
-    """Representation of a Egardia alarm."""
-
-    def __init__(self, name, egardiasystem,
-                 rs_enabled=False, rs_codes=None, rs_port=52010):
-        """Initialize the Egardia alarm."""
-        self._name = name
-        self._egardiasystem = egardiasystem
-        self._status = None
-        self._rs_enabled = rs_enabled
-        self._rs_codes = rs_codes
-        self._rs_port = rs_port
-
-    @asyncio.coroutine
-    def async_added_to_hass(self):
-        """Add Egardiaserver callback if enabled."""
-        if self._rs_enabled:
-            _LOGGER.debug("Registering callback to Egardiaserver")
-            self.hass.data[EGARDIA_SERVER].register_callback(
-                self.handle_status_event)
-
-    @property
-    def name(self):
-        """Return the name of the device."""
-        return self._name
-
-    @property
-    def state(self):
-        """Return the state of the device."""
-        return self._status
-
-    @property
-    def should_poll(self):
-        """Poll if no report server is enabled."""
-        if not self._rs_enabled:
-            return True
-        return False
-
-    def handle_status_event(self, event):
-        """Handle the Egardia system status event."""
-        statuscode = event.get('status')
-        if statuscode is not None:
-            status = self.lookupstatusfromcode(statuscode)
-            self.parsestatus(status)
-            self.schedule_update_ha_state()
-
-    def lookupstatusfromcode(self, statuscode):
-        """Look at the rs_codes and returns the status from the code."""
-        status = next((
-            status_group.upper() for status_group, codes
-            in self._rs_codes.items() for code in codes
-            if statuscode == code), 'UNKNOWN')
-        return status
-
-    def parsestatus(self, status):
-        """Parse the status."""
-        _LOGGER.debug("Parsing status %s", status)
-        # Ignore the statuscode if it is IGNORE
-        if status.lower().strip() != REPORT_SERVER_CODES_IGNORE:
-            _LOGGER.debug("Not ignoring status %s", status)
-            newstatus = STATES.get(status.upper())
-            _LOGGER.debug("newstatus %s", newstatus)
-            self._status = newstatus
-        else:
-            _LOGGER.error("Ignoring status")
-
-    def update(self):
-        """Update the alarm status."""
-        status = self._egardiasystem.getstate()
-        self.parsestatus(status)
-
-    def alarm_disarm(self, code=None):
-        """Send disarm command."""
-        try:
-            self._egardiasystem.alarm_disarm()
-        except requests.exceptions.RequestException as err:
-            _LOGGER.error("Egardia device exception occurred when "
-                          "sending disarm command: %s", err)
-
-    def alarm_arm_home(self, code=None):
-        """Send arm home command."""
-        try:
-            self._egardiasystem.alarm_arm_home()
-        except requests.exceptions.RequestException as err:
-            _LOGGER.error("Egardia device exception occurred when "
-                          "sending arm home command: %s", err)
-
-    def alarm_arm_away(self, code=None):
-        """Send arm away command."""
-        try:
-            self._egardiasystem.alarm_arm_away()
-        except requests.exceptions.RequestException as err:
-            _LOGGER.error("Egardia device exception occurred when "
-                          "sending arm away command: %s", err)

homeassistant/components/alarm_control_panel/envisalink.py

@@ -1,171 +0,0 @@
-"""
-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 asyncio
-import logging
-
-import voluptuous as vol
-
-from homeassistant.core import callback
-from homeassistant.helpers.dispatcher import async_dispatcher_connect
-import homeassistant.components.alarm_control_panel as alarm
-import homeassistant.helpers.config_validation as cv
-from homeassistant.components.envisalink import (
-    DATA_EVL, EnvisalinkDevice, PARTITION_SCHEMA, CONF_CODE, CONF_PANIC,
-    CONF_PARTITIONNAME, SIGNAL_KEYPAD_UPDATE, SIGNAL_PARTITION_UPDATE)
-from homeassistant.const import (
-    STATE_ALARM_ARMED_AWAY, STATE_ALARM_ARMED_HOME, STATE_ALARM_DISARMED,
-    STATE_UNKNOWN, STATE_ALARM_TRIGGERED, STATE_ALARM_PENDING, ATTR_ENTITY_ID)
-
-_LOGGER = logging.getLogger(__name__)
-
-DEPENDENCIES = ['envisalink']
-
-SERVICE_ALARM_KEYPRESS = 'envisalink_alarm_keypress'
-ATTR_KEYPRESS = 'keypress'
-ALARM_KEYPRESS_SCHEMA = vol.Schema({
-    vol.Required(ATTR_ENTITY_ID): cv.entity_ids,
-    vol.Required(ATTR_KEYPRESS): cv.string
-})
-
-
-@asyncio.coroutine
-def async_setup_platform(hass, config, async_add_entities,
-                         discovery_info=None):
-    """Perform the setup for Envisalink alarm panels."""
-    configured_partitions = discovery_info['partitions']
-    code = discovery_info[CONF_CODE]
-    panic_type = discovery_info[CONF_PANIC]
-
-    devices = []
-    for part_num in configured_partitions:
-        device_config_data = PARTITION_SCHEMA(configured_partitions[part_num])
-        device = EnvisalinkAlarm(
-            hass,
-            part_num,
-            device_config_data[CONF_PARTITIONNAME],
-            code,
-            panic_type,
-            hass.data[DATA_EVL].alarm_state['partition'][part_num],
-            hass.data[DATA_EVL]
-        )
-        devices.append(device)
-
-    async_add_entities(devices)
-
-    @callback
-    def alarm_keypress_handler(service):
-        """Map services to methods on Alarm."""
-        entity_ids = service.data.get(ATTR_ENTITY_ID)
-        keypress = service.data.get(ATTR_KEYPRESS)
-
-        target_devices = [device for device in devices
-                          if device.entity_id in entity_ids]
-
-        for device in target_devices:
-            device.async_alarm_keypress(keypress)
-
-    hass.services.async_register(
-        alarm.DOMAIN, SERVICE_ALARM_KEYPRESS, alarm_keypress_handler,
-        schema=ALARM_KEYPRESS_SCHEMA)
-
-    return True
-
-
-class EnvisalinkAlarm(EnvisalinkDevice, alarm.AlarmControlPanel):
-    """Representation of an Envisalink-based alarm panel."""
-
-    def __init__(self, hass, partition_number, alarm_name, code, panic_type,
-                 info, controller):
-        """Initialize the alarm panel."""
-        self._partition_number = partition_number
-        self._code = code
-        self._panic_type = panic_type
-
-        _LOGGER.debug("Setting up alarm: %s", alarm_name)
-        super().__init__(alarm_name, info, controller)
-
-    @asyncio.coroutine
-    def async_added_to_hass(self):
-        """Register callbacks."""
-        async_dispatcher_connect(
-            self.hass, SIGNAL_KEYPAD_UPDATE, self._update_callback)
-        async_dispatcher_connect(
-            self.hass, SIGNAL_PARTITION_UPDATE, self._update_callback)
-
-    @callback
-    def _update_callback(self, partition):
-        """Update Home Assistant state, if needed."""
-        if partition is None or int(partition) == self._partition_number:
-            self.async_schedule_update_ha_state()
-
-    @property
-    def code_format(self):
-        """Regex for code format or None if no code is required."""
-        if self._code:
-            return None
-        return 'Number'
-
-    @property
-    def state(self):
-        """Return the state of the device."""
-        state = STATE_UNKNOWN
-
-        if self._info['status']['alarm']:
-            state = STATE_ALARM_TRIGGERED
-        elif self._info['status']['armed_away']:
-            state = STATE_ALARM_ARMED_AWAY
-        elif self._info['status']['armed_stay']:
-            state = STATE_ALARM_ARMED_HOME
-        elif self._info['status']['exit_delay']:
-            state = STATE_ALARM_PENDING
-        elif self._info['status']['entry_delay']:
-            state = STATE_ALARM_PENDING
-        elif self._info['status']['alpha']:
-            state = STATE_ALARM_DISARMED
-        return state
-
-    @asyncio.coroutine
-    def async_alarm_disarm(self, code=None):
-        """Send disarm command."""
-        if code:
-            self.hass.data[DATA_EVL].disarm_partition(
-                str(code), self._partition_number)
-        else:
-            self.hass.data[DATA_EVL].disarm_partition(
-                str(self._code), self._partition_number)
-
-    @asyncio.coroutine
-    def async_alarm_arm_home(self, code=None):
-        """Send arm home command."""
-        if code:
-            self.hass.data[DATA_EVL].arm_stay_partition(
-                str(code), self._partition_number)
-        else:
-            self.hass.data[DATA_EVL].arm_stay_partition(
-                str(self._code), self._partition_number)
-
-    @asyncio.coroutine
-    def async_alarm_arm_away(self, code=None):
-        """Send arm away command."""
-        if code:
-            self.hass.data[DATA_EVL].arm_away_partition(
-                str(code), self._partition_number)
-        else:
-            self.hass.data[DATA_EVL].arm_away_partition(
-                str(self._code), self._partition_number)
-
-    @asyncio.coroutine
-    def async_alarm_trigger(self, code=None):
-        """Alarm trigger command. Will be used to trigger a panic alarm."""
-        self.hass.data[DATA_EVL].panic_alarm(self._panic_type)
-
-    @callback
-    def async_alarm_keypress(self, keypress=None):
-        """Send custom keypress."""
-        if keypress:
-            self.hass.data[DATA_EVL].keypresses_to_partition(
-                self._partition_number, keypress)

homeassistant/components/alarm_control_panel/homematicip_cloud.py

@@ -1,83 +0,0 @@
-"""
-Support for HomematicIP Cloud alarm control panel.
-
-For more details about this platform, please refer to the documentation at
-https://home-assistant.io/components/alarm_control_panel.homematicip_cloud/
-"""
-
-import logging
-
-from homeassistant.components.alarm_control_panel import AlarmControlPanel
-from homeassistant.components.homematicip_cloud import (
-    HMIPC_HAPID, HomematicipGenericDevice)
-from homeassistant.components.homematicip_cloud import DOMAIN as HMIPC_DOMAIN
-from homeassistant.const import (
-    STATE_ALARM_ARMED_AWAY, STATE_ALARM_ARMED_HOME, STATE_ALARM_DISARMED,
-    STATE_ALARM_TRIGGERED)
-
-_LOGGER = logging.getLogger(__name__)
-
-DEPENDENCIES = ['homematicip_cloud']
-
-HMIP_ZONE_AWAY = 'EXTERNAL'
-HMIP_ZONE_HOME = 'INTERNAL'
-
-
-async def async_setup_platform(
-        hass, config, async_add_entities, discovery_info=None):
-    """Set up the HomematicIP Cloud alarm control devices."""
-    pass
-
-
-async def async_setup_entry(hass, config_entry, async_add_entities):
-    """Set up the HomematicIP alarm control panel from a config entry."""
-    from homematicip.aio.group import AsyncSecurityZoneGroup
-
-    home = hass.data[HMIPC_DOMAIN][config_entry.data[HMIPC_HAPID]].home
-    devices = []
-    for group in home.groups:
-        if isinstance(group, AsyncSecurityZoneGroup):
-            devices.append(HomematicipSecurityZone(home, group))
-
-    if devices:
-        async_add_entities(devices)
-
-
-class HomematicipSecurityZone(HomematicipGenericDevice, AlarmControlPanel):
-    """Representation of an HomematicIP Cloud security zone group."""
-
-    def __init__(self, home, device):
-        """Initialize the security zone group."""
-        device.modelType = 'Group-SecurityZone'
-        device.windowState = ''
-        super().__init__(home, device)
-
-    @property
-    def state(self):
-        """Return the state of the device."""
-        from homematicip.base.enums import WindowState
-
-        if self._device.active:
-            if (self._device.sabotage or self._device.motionDetected or
-                    self._device.windowState == WindowState.OPEN):
-                return STATE_ALARM_TRIGGERED
-
-            active = self._home.get_security_zones_activation()
-            if active == (True, True):
-                return STATE_ALARM_ARMED_AWAY
-            if active == (False, True):
-                return STATE_ALARM_ARMED_HOME
-
-        return STATE_ALARM_DISARMED
-
-    async def async_alarm_disarm(self, code=None):
-        """Send disarm command."""
-        await self._home.set_security_zones_activation(False, False)
-
-    async def async_alarm_arm_home(self, code=None):
-        """Send arm home command."""
-        await self._home.set_security_zones_activation(True, False)
-
-    async def async_alarm_arm_away(self, code=None):
-        """Send arm away command."""
-        await self._home.set_security_zones_activation(True, True)

homeassistant/components/alarm_control_panel/ialarm.py

@@ -1,107 +0,0 @@
-"""
-Interfaces with iAlarm control panels.
-
-For more details about this platform, please refer to the documentation at
-https://home-assistant.io/components/alarm_control_panel.ialarm/
-"""
-import logging
-
-import voluptuous as vol
-
-import homeassistant.components.alarm_control_panel as alarm
-from homeassistant.components.alarm_control_panel import PLATFORM_SCHEMA
-from homeassistant.const import (
-    CONF_HOST, CONF_NAME, CONF_PASSWORD, CONF_USERNAME, STATE_ALARM_ARMED_AWAY,
-    STATE_ALARM_ARMED_HOME, STATE_ALARM_DISARMED)
-import homeassistant.helpers.config_validation as cv
-
-REQUIREMENTS = ['pyialarm==0.2']
-
-_LOGGER = logging.getLogger(__name__)
-
-DEFAULT_NAME = 'iAlarm'
-
-
-def no_application_protocol(value):
-    """Validate that value is without the application protocol."""
-    protocol_separator = "://"
-    if not value or protocol_separator in value:
-        raise vol.Invalid(
-            'Invalid host, {} is not allowed'.format(protocol_separator))
-
-    return value
-
-
-PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
-    vol.Required(CONF_HOST): vol.All(cv.string, no_application_protocol),
-    vol.Required(CONF_PASSWORD): cv.string,
-    vol.Required(CONF_USERNAME): cv.string,
-    vol.Optional(CONF_NAME, default=DEFAULT_NAME): cv.string,
-})
-
-
-def setup_platform(hass, config, add_entities, discovery_info=None):
-    """Set up an iAlarm control panel."""
-    name = config.get(CONF_NAME)
-    username = config.get(CONF_USERNAME)
-    password = config.get(CONF_PASSWORD)
-    host = config.get(CONF_HOST)
-
-    url = 'http://{}'.format(host)
-    ialarm = IAlarmPanel(name, username, password, url)
-    add_entities([ialarm], True)
-
-
-class IAlarmPanel(alarm.AlarmControlPanel):
-    """Representation of an iAlarm status."""
-
-    def __init__(self, name, username, password, url):
-        """Initialize the iAlarm status."""
-        from pyialarm import IAlarm
-
-        self._name = name
-        self._username = username
-        self._password = password
-        self._url = url
-        self._state = None
-        self._client = IAlarm(username, password, url)
-
-    @property
-    def name(self):
-        """Return the name of the device."""
-        return self._name
-
-    @property
-    def state(self):
-        """Return the state of the device."""
-        return self._state
-
-    def update(self):
-        """Return the state of the device."""
-        status = self._client.get_status()
-        _LOGGER.debug('iAlarm status: %s', status)
-        if status:
-            status = int(status)
-
-        if status == self._client.DISARMED:
-            state = STATE_ALARM_DISARMED
-        elif status == self._client.ARMED_AWAY:
-            state = STATE_ALARM_ARMED_AWAY
-        elif status == self._client.ARMED_STAY:
-            state = STATE_ALARM_ARMED_HOME
-        else:
-            state = None
-
-        self._state = state
-
-    def alarm_disarm(self, code=None):
-        """Send disarm command."""
-        self._client.disarm()
-
-    def alarm_arm_away(self, code=None):
-        """Send arm away command."""
-        self._client.arm_away()
-
-    def alarm_arm_home(self, code=None):
-        """Send arm home command."""
-        self._client.arm_stay()

homeassistant/components/alarm_control_panel/ifttt.py

@@ -1,175 +0,0 @@
-"""
-Interfaces with alarm control panels that have to be controlled through IFTTT.
-
-For more details about this platform, please refer to the documentation at
-https://home-assistant.io/components/alarm_control_panel.ifttt/
-"""
-import logging
-import re
-
-import voluptuous as vol
-
-import homeassistant.components.alarm_control_panel as alarm
-from homeassistant.components.alarm_control_panel import (
-    DOMAIN, PLATFORM_SCHEMA)
-from homeassistant.components.ifttt import (
-    ATTR_EVENT, DOMAIN as IFTTT_DOMAIN, SERVICE_TRIGGER)
-from homeassistant.const import (
-    ATTR_ENTITY_ID, ATTR_STATE, CONF_NAME, CONF_CODE,
-    CONF_OPTIMISTIC, STATE_ALARM_DISARMED, STATE_ALARM_ARMED_NIGHT,
-    STATE_ALARM_ARMED_HOME, STATE_ALARM_ARMED_AWAY)
-import homeassistant.helpers.config_validation as cv
-
-DEPENDENCIES = ['ifttt']
-
-_LOGGER = logging.getLogger(__name__)
-
-ALLOWED_STATES = [
-    STATE_ALARM_DISARMED, STATE_ALARM_ARMED_NIGHT,
-    STATE_ALARM_ARMED_AWAY, STATE_ALARM_ARMED_HOME]
-
-DATA_IFTTT_ALARM = 'ifttt_alarm'
-DEFAULT_NAME = "Home"
-
-CONF_EVENT_AWAY = "event_arm_away"
-CONF_EVENT_HOME = "event_arm_home"
-CONF_EVENT_NIGHT = "event_arm_night"
-CONF_EVENT_DISARM = "event_disarm"
-
-DEFAULT_EVENT_AWAY = "alarm_arm_away"
-DEFAULT_EVENT_HOME = "alarm_arm_home"
-DEFAULT_EVENT_NIGHT = "alarm_arm_night"
-DEFAULT_EVENT_DISARM = "alarm_disarm"
-
-PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
-    vol.Optional(CONF_NAME, default=DEFAULT_NAME): cv.string,
-    vol.Optional(CONF_CODE): cv.string,
-    vol.Optional(CONF_EVENT_AWAY, default=DEFAULT_EVENT_AWAY): cv.string,
-    vol.Optional(CONF_EVENT_HOME, default=DEFAULT_EVENT_HOME): cv.string,
-    vol.Optional(CONF_EVENT_NIGHT, default=DEFAULT_EVENT_NIGHT): cv.string,
-    vol.Optional(CONF_EVENT_DISARM, default=DEFAULT_EVENT_DISARM): cv.string,
-    vol.Optional(CONF_OPTIMISTIC, default=False): cv.boolean,
-})
-
-SERVICE_PUSH_ALARM_STATE = "ifttt_push_alarm_state"
-
-PUSH_ALARM_STATE_SERVICE_SCHEMA = vol.Schema({
-    vol.Required(ATTR_ENTITY_ID): cv.entity_ids,
-    vol.Required(ATTR_STATE): cv.string,
-})
-
-
-def setup_platform(hass, config, add_entities, discovery_info=None):
-    """Set up a control panel managed through IFTTT."""
-    if DATA_IFTTT_ALARM not in hass.data:
-        hass.data[DATA_IFTTT_ALARM] = []
-
-    name = config.get(CONF_NAME)
-    code = config.get(CONF_CODE)
-    event_away = config.get(CONF_EVENT_AWAY)
-    event_home = config.get(CONF_EVENT_HOME)
-    event_night = config.get(CONF_EVENT_NIGHT)
-    event_disarm = config.get(CONF_EVENT_DISARM)
-    optimistic = config.get(CONF_OPTIMISTIC)
-
-    alarmpanel = IFTTTAlarmPanel(name, code, event_away, event_home,
-                                 event_night, event_disarm, optimistic)
-    hass.data[DATA_IFTTT_ALARM].append(alarmpanel)
-    add_entities([alarmpanel])
-
-    async def push_state_update(service):
-        """Set the service state as device state attribute."""
-        entity_ids = service.data.get(ATTR_ENTITY_ID)
-        state = service.data.get(ATTR_STATE)
-        devices = hass.data[DATA_IFTTT_ALARM]
-        if entity_ids:
-            devices = [d for d in devices if d.entity_id in entity_ids]
-
-        for device in devices:
-            device.push_alarm_state(state)
-            device.async_schedule_update_ha_state()
-
-    hass.services.register(DOMAIN, SERVICE_PUSH_ALARM_STATE, push_state_update,
-                           schema=PUSH_ALARM_STATE_SERVICE_SCHEMA)
-
-
-class IFTTTAlarmPanel(alarm.AlarmControlPanel):
-    """Representation of an alarm control panel controlled through IFTTT."""
-
-    def __init__(self, name, code, event_away, event_home, event_night,
-                 event_disarm, optimistic):
-        """Initialize the alarm control panel."""
-        self._name = name
-        self._code = code
-        self._event_away = event_away
-        self._event_home = event_home
-        self._event_night = event_night
-        self._event_disarm = event_disarm
-        self._optimistic = optimistic
-        self._state = None
-
-    @property
-    def name(self):
-        """Return the name of the device."""
-        return self._name
-
-    @property
-    def state(self):
-        """Return the state of the device."""
-        return self._state
-
-    @property
-    def assumed_state(self):
-        """Notify that this platform return an assumed state."""
-        return True
-
-    @property
-    def code_format(self):
-        """Return one or more digits/characters."""
-        if self._code is None:
-            return None
-        if isinstance(self._code, str) and re.search('^\\d+$', self._code):
-            return 'Number'
-        return 'Any'
-
-    def alarm_disarm(self, code=None):
-        """Send disarm command."""
-        if not self._check_code(code):
-            return
-        self.set_alarm_state(self._event_disarm, STATE_ALARM_DISARMED)
-
-    def alarm_arm_away(self, code=None):
-        """Send arm away command."""
-        if not self._check_code(code):
-            return
-        self.set_alarm_state(self._event_away, STATE_ALARM_ARMED_AWAY)
-
-    def alarm_arm_home(self, code=None):
-        """Send arm home command."""
-        if not self._check_code(code):
-            return
-        self.set_alarm_state(self._event_home, STATE_ALARM_ARMED_HOME)
-
-    def alarm_arm_night(self, code=None):
-        """Send arm night command."""
-        if not self._check_code(code):
-            return
-        self.set_alarm_state(self._event_night, STATE_ALARM_ARMED_NIGHT)
-
-    def set_alarm_state(self, event, state):
-        """Call the IFTTT trigger service to change the alarm state."""
-        data = {ATTR_EVENT: event}
-
-        self.hass.services.call(IFTTT_DOMAIN, SERVICE_TRIGGER, data)
-        _LOGGER.debug("Called IFTTT component to trigger event %s", event)
-        if self._optimistic:
-            self._state = state
-
-    def push_alarm_state(self, value):
-        """Push the alarm state to the given value."""
-        if value in ALLOWED_STATES:
-            _LOGGER.debug("Pushed the alarm state to %s", value)
-            self._state = value
-
-    def _check_code(self, code):
-        return self._code is None or self._code == code

homeassistant/components/alarm_control_panel/manifest.json

@@ -0,0 +1,10 @@
+{
+  "domain": "alarm_control_panel",
+  "name": "Alarm control panel",
+  "documentation": "https://www.home-assistant.io/components/alarm_control_panel",
+  "requirements": [],
+  "dependencies": [],
+  "codeowners": [
+    "@colinodell"
+  ]
+}

homeassistant/components/alarm_control_panel/manual.py

@@ -1,308 +0,0 @@
-"""
-Support for manual alarms.
-
-For more details about this platform, please refer to the documentation at
-https://home-assistant.io/components/alarm_control_panel.manual/
-"""
-import copy
-import datetime
-import logging
-import re
-
-import voluptuous as vol
-
-import homeassistant.components.alarm_control_panel as alarm
-from homeassistant.const import (
-    CONF_CODE, CONF_DELAY_TIME, CONF_DISARM_AFTER_TRIGGER, CONF_NAME,
-    CONF_PENDING_TIME, CONF_PLATFORM, CONF_TRIGGER_TIME,
-    STATE_ALARM_ARMED_AWAY, STATE_ALARM_ARMED_CUSTOM_BYPASS,
-    STATE_ALARM_ARMED_HOME, STATE_ALARM_ARMED_NIGHT, STATE_ALARM_DISARMED,
-    STATE_ALARM_PENDING, STATE_ALARM_TRIGGERED)
-import homeassistant.helpers.config_validation as cv
-from homeassistant.helpers.event import track_point_in_time
-import homeassistant.util.dt as dt_util
-
-_LOGGER = logging.getLogger(__name__)
-
-CONF_CODE_TEMPLATE = 'code_template'
-
-DEFAULT_ALARM_NAME = 'HA Alarm'
-DEFAULT_DELAY_TIME = datetime.timedelta(seconds=0)
-DEFAULT_PENDING_TIME = datetime.timedelta(seconds=60)
-DEFAULT_TRIGGER_TIME = datetime.timedelta(seconds=120)
-DEFAULT_DISARM_AFTER_TRIGGER = False
-
-SUPPORTED_STATES = [STATE_ALARM_DISARMED, STATE_ALARM_ARMED_AWAY,
-                    STATE_ALARM_ARMED_HOME, STATE_ALARM_ARMED_NIGHT,
-                    STATE_ALARM_ARMED_CUSTOM_BYPASS, STATE_ALARM_TRIGGERED]
-
-SUPPORTED_PRETRIGGER_STATES = [state for state in SUPPORTED_STATES
-                               if state != STATE_ALARM_TRIGGERED]
-
-SUPPORTED_PENDING_STATES = [state for state in SUPPORTED_STATES
-                            if state != STATE_ALARM_DISARMED]
-
-ATTR_PRE_PENDING_STATE = 'pre_pending_state'
-ATTR_POST_PENDING_STATE = 'post_pending_state'
-
-
-def _state_validator(config):
-    """Validate the state."""
-    config = copy.deepcopy(config)
-    for state in SUPPORTED_PRETRIGGER_STATES:
-        if CONF_DELAY_TIME not in config[state]:
-            config[state][CONF_DELAY_TIME] = config[CONF_DELAY_TIME]
-        if CONF_TRIGGER_TIME not in config[state]:
-            config[state][CONF_TRIGGER_TIME] = config[CONF_TRIGGER_TIME]
-    for state in SUPPORTED_PENDING_STATES:
-        if CONF_PENDING_TIME not in config[state]:
-            config[state][CONF_PENDING_TIME] = config[CONF_PENDING_TIME]
-
-    return config
-
-
-def _state_schema(state):
-    """Validate the state."""
-    schema = {}
-    if state in SUPPORTED_PRETRIGGER_STATES:
-        schema[vol.Optional(CONF_DELAY_TIME)] = vol.All(
-            cv.time_period, cv.positive_timedelta)
-        schema[vol.Optional(CONF_TRIGGER_TIME)] = vol.All(
-            cv.time_period, cv.positive_timedelta)
-    if state in SUPPORTED_PENDING_STATES:
-        schema[vol.Optional(CONF_PENDING_TIME)] = vol.All(
-            cv.time_period, cv.positive_timedelta)
-    return vol.Schema(schema)
-
-
-PLATFORM_SCHEMA = vol.Schema(vol.All({
-    vol.Required(CONF_PLATFORM): 'manual',
-    vol.Optional(CONF_NAME, default=DEFAULT_ALARM_NAME): cv.string,
-    vol.Exclusive(CONF_CODE, 'code validation'): cv.string,
-    vol.Exclusive(CONF_CODE_TEMPLATE, 'code validation'): cv.template,
-    vol.Optional(CONF_DELAY_TIME, default=DEFAULT_DELAY_TIME):
-        vol.All(cv.time_period, cv.positive_timedelta),
-    vol.Optional(CONF_PENDING_TIME, default=DEFAULT_PENDING_TIME):
-        vol.All(cv.time_period, cv.positive_timedelta),
-    vol.Optional(CONF_TRIGGER_TIME, default=DEFAULT_TRIGGER_TIME):
-        vol.All(cv.time_period, cv.positive_timedelta),
-    vol.Optional(CONF_DISARM_AFTER_TRIGGER,
-                 default=DEFAULT_DISARM_AFTER_TRIGGER): cv.boolean,
-    vol.Optional(STATE_ALARM_ARMED_AWAY, default={}):
-        _state_schema(STATE_ALARM_ARMED_AWAY),
-    vol.Optional(STATE_ALARM_ARMED_HOME, default={}):
-        _state_schema(STATE_ALARM_ARMED_HOME),
-    vol.Optional(STATE_ALARM_ARMED_NIGHT, default={}):
-        _state_schema(STATE_ALARM_ARMED_NIGHT),
-    vol.Optional(STATE_ALARM_ARMED_CUSTOM_BYPASS, default={}):
-        _state_schema(STATE_ALARM_ARMED_CUSTOM_BYPASS),
-    vol.Optional(STATE_ALARM_DISARMED, default={}):
-        _state_schema(STATE_ALARM_DISARMED),
-    vol.Optional(STATE_ALARM_TRIGGERED, default={}):
-        _state_schema(STATE_ALARM_TRIGGERED),
-}, _state_validator))
-
-
-def setup_platform(hass, config, add_entities, discovery_info=None):
-    """Set up the manual alarm platform."""
-    add_entities([ManualAlarm(
-        hass,
-        config[CONF_NAME],
-        config.get(CONF_CODE),
-        config.get(CONF_CODE_TEMPLATE),
-        config.get(CONF_DISARM_AFTER_TRIGGER, DEFAULT_DISARM_AFTER_TRIGGER),
-        config
-        )])
-
-
-class ManualAlarm(alarm.AlarmControlPanel):
-    """
-    Representation of an alarm status.
-
-    When armed, will be pending for 'pending_time', after that armed.
-    When triggered, will be pending for the triggering state's 'delay_time'
-    plus the triggered state's 'pending_time'.
-    After that will be triggered for 'trigger_time', after that we return to
-    the previous state or disarm if `disarm_after_trigger` is true.
-    A trigger_time of zero disables the alarm_trigger service.
-    """
-
-    def __init__(self, hass, name, code, code_template,
-                 disarm_after_trigger, config):
-        """Init the manual alarm panel."""
-        self._state = STATE_ALARM_DISARMED
-        self._hass = hass
-        self._name = name
-        if code_template:
-            self._code = code_template
-            self._code.hass = hass
-        else:
-            self._code = code or None
-        self._disarm_after_trigger = disarm_after_trigger
-        self._previous_state = self._state
-        self._state_ts = None
-
-        self._delay_time_by_state = {
-            state: config[state][CONF_DELAY_TIME]
-            for state in SUPPORTED_PRETRIGGER_STATES}
-        self._trigger_time_by_state = {
-            state: config[state][CONF_TRIGGER_TIME]
-            for state in SUPPORTED_PRETRIGGER_STATES}
-        self._pending_time_by_state = {
-            state: config[state][CONF_PENDING_TIME]
-            for state in SUPPORTED_PENDING_STATES}
-
-    @property
-    def should_poll(self):
-        """Return the polling state."""
-        return False
-
-    @property
-    def name(self):
-        """Return the name of the device."""
-        return self._name
-
-    @property
-    def state(self):
-        """Return the state of the device."""
-        if self._state == STATE_ALARM_TRIGGERED:
-            if self._within_pending_time(self._state):
-                return STATE_ALARM_PENDING
-            trigger_time = self._trigger_time_by_state[self._previous_state]
-            if (self._state_ts + self._pending_time(self._state) +
-                    trigger_time) < dt_util.utcnow():
-                if self._disarm_after_trigger:
-                    return STATE_ALARM_DISARMED
-                self._state = self._previous_state
-                return self._state
-
-        if self._state in SUPPORTED_PENDING_STATES and \
-                self._within_pending_time(self._state):
-            return STATE_ALARM_PENDING
-
-        return self._state
-
-    @property
-    def _active_state(self):
-        """Get the current state."""
-        if self.state == STATE_ALARM_PENDING:
-            return self._previous_state
-        return self._state
-
-    def _pending_time(self, state):
-        """Get the pending time."""
-        pending_time = self._pending_time_by_state[state]
-        if state == STATE_ALARM_TRIGGERED:
-            pending_time += self._delay_time_by_state[self._previous_state]
-        return pending_time
-
-    def _within_pending_time(self, state):
-        """Get if the action is in the pending time window."""
-        return self._state_ts + self._pending_time(state) > dt_util.utcnow()
-
-    @property
-    def code_format(self):
-        """Return one or more digits/characters."""
-        if self._code is None:
-            return None
-        if isinstance(self._code, str) and re.search('^\\d+$', self._code):
-            return 'Number'
-        return 'Any'
-
-    def alarm_disarm(self, code=None):
-        """Send disarm command."""
-        if not self._validate_code(code, STATE_ALARM_DISARMED):
-            return
-
-        self._state = STATE_ALARM_DISARMED
-        self._state_ts = dt_util.utcnow()
-        self.schedule_update_ha_state()
-
-    def alarm_arm_home(self, code=None):
-        """Send arm home command."""
-        if not self._validate_code(code, STATE_ALARM_ARMED_HOME):
-            return
-
-        self._update_state(STATE_ALARM_ARMED_HOME)
-
-    def alarm_arm_away(self, code=None):
-        """Send arm away command."""
-        if not self._validate_code(code, STATE_ALARM_ARMED_AWAY):
-            return
-
-        self._update_state(STATE_ALARM_ARMED_AWAY)
-
-    def alarm_arm_night(self, code=None):
-        """Send arm night command."""
-        if not self._validate_code(code, STATE_ALARM_ARMED_NIGHT):
-            return
-
-        self._update_state(STATE_ALARM_ARMED_NIGHT)
-
-    def alarm_arm_custom_bypass(self, code=None):
-        """Send arm custom bypass command."""
-        if not self._validate_code(code, STATE_ALARM_ARMED_CUSTOM_BYPASS):
-            return
-
-        self._update_state(STATE_ALARM_ARMED_CUSTOM_BYPASS)
-
-    def alarm_trigger(self, code=None):
-        """
-        Send alarm trigger command.
-
-        No code needed, a trigger time of zero for the current state
-        disables the alarm.
-        """
-        if not self._trigger_time_by_state[self._active_state]:
-            return
-        self._update_state(STATE_ALARM_TRIGGERED)
-
-    def _update_state(self, state):
-        """Update the state."""
-        if self._state == state:
-            return
-
-        self._previous_state = self._state
-        self._state = state
-        self._state_ts = dt_util.utcnow()
-        self.schedule_update_ha_state()
-
-        pending_time = self._pending_time(state)
-        if state == STATE_ALARM_TRIGGERED:
-            track_point_in_time(
-                self._hass, self.async_update_ha_state,
-                self._state_ts + pending_time)
-
-            trigger_time = self._trigger_time_by_state[self._previous_state]
-            track_point_in_time(
-                self._hass, self.async_update_ha_state,
-                self._state_ts + pending_time + trigger_time)
-        elif state in SUPPORTED_PENDING_STATES and pending_time:
-            track_point_in_time(
-                self._hass, self.async_update_ha_state,
-                self._state_ts + pending_time)
-
-    def _validate_code(self, code, state):
-        """Validate given code."""
-        if self._code is None:
-            return True
-        if isinstance(self._code, str):
-            alarm_code = self._code
-        else:
-            alarm_code = self._code.render(from_state=self._state,
-                                           to_state=state)
-        check = not alarm_code or code == alarm_code
-        if not check:
-            _LOGGER.warning("Invalid code given for %s", state)
-        return check
-
-    @property
-    def device_state_attributes(self):
-        """Return the state attributes."""
-        state_attr = {}
-
-        if self.state == STATE_ALARM_PENDING:
-            state_attr[ATTR_PRE_PENDING_STATE] = self._previous_state
-            state_attr[ATTR_POST_PENDING_STATE] = self._state
-
-        return state_attr

homeassistant/components/alarm_control_panel/manual_mqtt.py

@@ -1,370 +0,0 @@
-"""
-Support for manual alarms controllable via MQTT.
-
-For more details about this platform, please refer to the documentation at
-https://home-assistant.io/components/alarm_control_panel.manual_mqtt/
-"""
-import asyncio
-import copy
-import datetime
-import logging
-import re
-
-import voluptuous as vol
-
-import homeassistant.components.alarm_control_panel as alarm
-import homeassistant.util.dt as dt_util
-from homeassistant.const import (
-    STATE_ALARM_ARMED_AWAY, STATE_ALARM_ARMED_HOME, STATE_ALARM_ARMED_NIGHT,
-    STATE_ALARM_DISARMED, STATE_ALARM_PENDING, STATE_ALARM_TRIGGERED,
-    CONF_PLATFORM, CONF_NAME, CONF_CODE, CONF_DELAY_TIME, CONF_PENDING_TIME,
-    CONF_TRIGGER_TIME, CONF_DISARM_AFTER_TRIGGER)
-from homeassistant.components import mqtt
-
-from homeassistant.helpers.event import async_track_state_change
-from homeassistant.core import callback
-
-import homeassistant.helpers.config_validation as cv
-from homeassistant.helpers.event import track_point_in_time
-
-_LOGGER = logging.getLogger(__name__)
-
-CONF_CODE_TEMPLATE = 'code_template'
-
-CONF_PAYLOAD_DISARM = 'payload_disarm'
-CONF_PAYLOAD_ARM_HOME = 'payload_arm_home'
-CONF_PAYLOAD_ARM_AWAY = 'payload_arm_away'
-CONF_PAYLOAD_ARM_NIGHT = 'payload_arm_night'
-
-DEFAULT_ALARM_NAME = 'HA Alarm'
-DEFAULT_DELAY_TIME = datetime.timedelta(seconds=0)
-DEFAULT_PENDING_TIME = datetime.timedelta(seconds=60)
-DEFAULT_TRIGGER_TIME = datetime.timedelta(seconds=120)
-DEFAULT_DISARM_AFTER_TRIGGER = False
-DEFAULT_ARM_AWAY = 'ARM_AWAY'
-DEFAULT_ARM_HOME = 'ARM_HOME'
-DEFAULT_ARM_NIGHT = 'ARM_NIGHT'
-DEFAULT_DISARM = 'DISARM'
-
-SUPPORTED_STATES = [STATE_ALARM_DISARMED, STATE_ALARM_ARMED_AWAY,
-                    STATE_ALARM_ARMED_HOME, STATE_ALARM_ARMED_NIGHT,
-                    STATE_ALARM_TRIGGERED]
-
-SUPPORTED_PRETRIGGER_STATES = [state for state in SUPPORTED_STATES
-                               if state != STATE_ALARM_TRIGGERED]
-
-SUPPORTED_PENDING_STATES = [state for state in SUPPORTED_STATES
-                            if state != STATE_ALARM_DISARMED]
-
-ATTR_PRE_PENDING_STATE = 'pre_pending_state'
-ATTR_POST_PENDING_STATE = 'post_pending_state'
-
-
-def _state_validator(config):
-    """Validate the state."""
-    config = copy.deepcopy(config)
-    for state in SUPPORTED_PRETRIGGER_STATES:
-        if CONF_DELAY_TIME not in config[state]:
-            config[state][CONF_DELAY_TIME] = config[CONF_DELAY_TIME]
-        if CONF_TRIGGER_TIME not in config[state]:
-            config[state][CONF_TRIGGER_TIME] = config[CONF_TRIGGER_TIME]
-    for state in SUPPORTED_PENDING_STATES:
-        if CONF_PENDING_TIME not in config[state]:
-            config[state][CONF_PENDING_TIME] = config[CONF_PENDING_TIME]
-
-    return config
-
-
-def _state_schema(state):
-    """Validate the state."""
-    schema = {}
-    if state in SUPPORTED_PRETRIGGER_STATES:
-        schema[vol.Optional(CONF_DELAY_TIME)] = vol.All(
-            cv.time_period, cv.positive_timedelta)
-        schema[vol.Optional(CONF_TRIGGER_TIME)] = vol.All(
-            cv.time_period, cv.positive_timedelta)
-    if state in SUPPORTED_PENDING_STATES:
-        schema[vol.Optional(CONF_PENDING_TIME)] = vol.All(
-            cv.time_period, cv.positive_timedelta)
-    return vol.Schema(schema)
-
-
-DEPENDENCIES = ['mqtt']
-
-PLATFORM_SCHEMA = vol.Schema(vol.All(mqtt.MQTT_BASE_PLATFORM_SCHEMA.extend({
-    vol.Required(CONF_PLATFORM): 'manual_mqtt',
-    vol.Optional(CONF_NAME, default=DEFAULT_ALARM_NAME): cv.string,
-    vol.Exclusive(CONF_CODE, 'code validation'): cv.string,
-    vol.Exclusive(CONF_CODE_TEMPLATE, 'code validation'): cv.template,
-    vol.Optional(CONF_DELAY_TIME, default=DEFAULT_DELAY_TIME):
-        vol.All(cv.time_period, cv.positive_timedelta),
-    vol.Optional(CONF_PENDING_TIME, default=DEFAULT_PENDING_TIME):
-        vol.All(cv.time_period, cv.positive_timedelta),
-    vol.Optional(CONF_TRIGGER_TIME, default=DEFAULT_TRIGGER_TIME):
-        vol.All(cv.time_period, cv.positive_timedelta),
-    vol.Optional(CONF_DISARM_AFTER_TRIGGER,
-                 default=DEFAULT_DISARM_AFTER_TRIGGER): cv.boolean,
-    vol.Optional(STATE_ALARM_ARMED_AWAY, default={}):
-        _state_schema(STATE_ALARM_ARMED_AWAY),
-    vol.Optional(STATE_ALARM_ARMED_HOME, default={}):
-        _state_schema(STATE_ALARM_ARMED_HOME),
-    vol.Optional(STATE_ALARM_ARMED_NIGHT, default={}):
-        _state_schema(STATE_ALARM_ARMED_NIGHT),
-    vol.Optional(STATE_ALARM_DISARMED, default={}):
-        _state_schema(STATE_ALARM_DISARMED),
-    vol.Optional(STATE_ALARM_TRIGGERED, default={}):
-        _state_schema(STATE_ALARM_TRIGGERED),
-    vol.Required(mqtt.CONF_COMMAND_TOPIC): mqtt.valid_publish_topic,
-    vol.Required(mqtt.CONF_STATE_TOPIC): mqtt.valid_subscribe_topic,
-    vol.Optional(CONF_PAYLOAD_ARM_AWAY, default=DEFAULT_ARM_AWAY): cv.string,
-    vol.Optional(CONF_PAYLOAD_ARM_HOME, default=DEFAULT_ARM_HOME): cv.string,
-    vol.Optional(CONF_PAYLOAD_ARM_NIGHT, default=DEFAULT_ARM_NIGHT): cv.string,
-    vol.Optional(CONF_PAYLOAD_DISARM, default=DEFAULT_DISARM): cv.string,
-}), _state_validator))
-
-
-def setup_platform(hass, config, add_entities, discovery_info=None):
-    """Set up the manual MQTT alarm platform."""
-    add_entities([ManualMQTTAlarm(
-        hass,
-        config[CONF_NAME],
-        config.get(CONF_CODE),
-        config.get(CONF_CODE_TEMPLATE),
-        config.get(CONF_DISARM_AFTER_TRIGGER, DEFAULT_DISARM_AFTER_TRIGGER),
-        config.get(mqtt.CONF_STATE_TOPIC),
-        config.get(mqtt.CONF_COMMAND_TOPIC),
-        config.get(mqtt.CONF_QOS),
-        config.get(CONF_PAYLOAD_DISARM),
-        config.get(CONF_PAYLOAD_ARM_HOME),
-        config.get(CONF_PAYLOAD_ARM_AWAY),
-        config.get(CONF_PAYLOAD_ARM_NIGHT),
-        config)])
-
-
-class ManualMQTTAlarm(alarm.AlarmControlPanel):
-    """
-    Representation of an alarm status.
-
-    When armed, will be pending for 'pending_time', after that armed.
-    When triggered, will be pending for the triggering state's 'delay_time'
-    plus the triggered state's 'pending_time'.
-    After that will be triggered for 'trigger_time', after that we return to
-    the previous state or disarm if `disarm_after_trigger` is true.
-    A trigger_time of zero disables the alarm_trigger service.
-    """
-
-    def __init__(self, hass, name, code, code_template, disarm_after_trigger,
-                 state_topic, command_topic, qos, payload_disarm,
-                 payload_arm_home, payload_arm_away, payload_arm_night,
-                 config):
-        """Init the manual MQTT alarm panel."""
-        self._state = STATE_ALARM_DISARMED
-        self._hass = hass
-        self._name = name
-        if code_template:
-            self._code = code_template
-            self._code.hass = hass
-        else:
-            self._code = code or None
-        self._disarm_after_trigger = disarm_after_trigger
-        self._previous_state = self._state
-        self._state_ts = None
-
-        self._delay_time_by_state = {
-            state: config[state][CONF_DELAY_TIME]
-            for state in SUPPORTED_PRETRIGGER_STATES}
-        self._trigger_time_by_state = {
-            state: config[state][CONF_TRIGGER_TIME]
-            for state in SUPPORTED_PRETRIGGER_STATES}
-        self._pending_time_by_state = {
-            state: config[state][CONF_PENDING_TIME]
-            for state in SUPPORTED_PENDING_STATES}
-
-        self._state_topic = state_topic
-        self._command_topic = command_topic
-        self._qos = qos
-        self._payload_disarm = payload_disarm
-        self._payload_arm_home = payload_arm_home
-        self._payload_arm_away = payload_arm_away
-        self._payload_arm_night = payload_arm_night
-
-    @property
-    def should_poll(self):
-        """Return the polling state."""
-        return False
-
-    @property
-    def name(self):
-        """Return the name of the device."""
-        return self._name
-
-    @property
-    def state(self):
-        """Return the state of the device."""
-        if self._state == STATE_ALARM_TRIGGERED:
-            if self._within_pending_time(self._state):
-                return STATE_ALARM_PENDING
-            trigger_time = self._trigger_time_by_state[self._previous_state]
-            if (self._state_ts + self._pending_time(self._state) +
-                    trigger_time) < dt_util.utcnow():
-                if self._disarm_after_trigger:
-                    return STATE_ALARM_DISARMED
-                self._state = self._previous_state
-                return self._state
-
-        if self._state in SUPPORTED_PENDING_STATES and \
-                self._within_pending_time(self._state):
-            return STATE_ALARM_PENDING
-
-        return self._state
-
-    @property
-    def _active_state(self):
-        """Get the current state."""
-        if self.state == STATE_ALARM_PENDING:
-            return self._previous_state
-        return self._state
-
-    def _pending_time(self, state):
-        """Get the pending time."""
-        pending_time = self._pending_time_by_state[state]
-        if state == STATE_ALARM_TRIGGERED:
-            pending_time += self._delay_time_by_state[self._previous_state]
-        return pending_time
-
-    def _within_pending_time(self, state):
-        """Get if the action is in the pending time window."""
-        return self._state_ts + self._pending_time(state) > dt_util.utcnow()
-
-    @property
-    def code_format(self):
-        """Return one or more digits/characters."""
-        if self._code is None:
-            return None
-        if isinstance(self._code, str) and re.search('^\\d+$', self._code):
-            return 'Number'
-        return 'Any'
-
-    def alarm_disarm(self, code=None):
-        """Send disarm command."""
-        if not self._validate_code(code, STATE_ALARM_DISARMED):
-            return
-
-        self._state = STATE_ALARM_DISARMED
-        self._state_ts = dt_util.utcnow()
-        self.schedule_update_ha_state()
-
-    def alarm_arm_home(self, code=None):
-        """Send arm home command."""
-        if not self._validate_code(code, STATE_ALARM_ARMED_HOME):
-            return
-
-        self._update_state(STATE_ALARM_ARMED_HOME)
-
-    def alarm_arm_away(self, code=None):
-        """Send arm away command."""
-        if not self._validate_code(code, STATE_ALARM_ARMED_AWAY):
-            return
-
-        self._update_state(STATE_ALARM_ARMED_AWAY)
-
-    def alarm_arm_night(self, code=None):
-        """Send arm night command."""
-        if not self._validate_code(code, STATE_ALARM_ARMED_NIGHT):
-            return
-
-        self._update_state(STATE_ALARM_ARMED_NIGHT)
-
-    def alarm_trigger(self, code=None):
-        """
-        Send alarm trigger command.
-
-        No code needed, a trigger time of zero for the current state
-        disables the alarm.
-        """
-        if not self._trigger_time_by_state[self._active_state]:
-            return
-        self._update_state(STATE_ALARM_TRIGGERED)
-
-    def _update_state(self, state):
-        """Update the state."""
-        if self._state == state:
-            return
-
-        self._previous_state = self._state
-        self._state = state
-        self._state_ts = dt_util.utcnow()
-        self.schedule_update_ha_state()
-
-        pending_time = self._pending_time(state)
-        if state == STATE_ALARM_TRIGGERED:
-            track_point_in_time(
-                self._hass, self.async_update_ha_state,
-                self._state_ts + pending_time)
-
-            trigger_time = self._trigger_time_by_state[self._previous_state]
-            track_point_in_time(
-                self._hass, self.async_update_ha_state,
-                self._state_ts + pending_time + trigger_time)
-        elif state in SUPPORTED_PENDING_STATES and pending_time:
-            track_point_in_time(
-                self._hass, self.async_update_ha_state,
-                self._state_ts + pending_time)
-
-    def _validate_code(self, code, state):
-        """Validate given code."""
-        if self._code is None:
-            return True
-        if isinstance(self._code, str):
-            alarm_code = self._code
-        else:
-            alarm_code = self._code.render(from_state=self._state,
-                                           to_state=state)
-        check = not alarm_code or code == alarm_code
-        if not check:
-            _LOGGER.warning("Invalid code given for %s", state)
-        return check
-
-    @property
-    def device_state_attributes(self):
-        """Return the state attributes."""
-        state_attr = {}
-
-        if self.state == STATE_ALARM_PENDING:
-            state_attr[ATTR_PRE_PENDING_STATE] = self._previous_state
-            state_attr[ATTR_POST_PENDING_STATE] = self._state
-
-        return state_attr
-
-    def async_added_to_hass(self):
-        """Subscribe to MQTT events.
-
-        This method must be run in the event loop and returns a coroutine.
-        """
-        async_track_state_change(
-            self.hass, self.entity_id, self._async_state_changed_listener
-        )
-
-        @callback
-        def message_received(topic, payload, qos):
-            """Run when new MQTT message has been received."""
-            if payload == self._payload_disarm:
-                self.async_alarm_disarm(self._code)
-            elif payload == self._payload_arm_home:
-                self.async_alarm_arm_home(self._code)
-            elif payload == self._payload_arm_away:
-                self.async_alarm_arm_away(self._code)
-            elif payload == self._payload_arm_night:
-                self.async_alarm_arm_night(self._code)
-            else:
-                _LOGGER.warning("Received unexpected payload: %s", payload)
-                return
-
-        return mqtt.async_subscribe(
-            self.hass, self._command_topic, message_received, self._qos)
-
-    @asyncio.coroutine
-    def _async_state_changed_listener(self, entity_id, old_state, new_state):
-        """Publish state change to MQTT."""
-        mqtt.async_publish(
-            self.hass, self._state_topic, new_state.state, self._qos, True)

homeassistant/components/alarm_control_panel/mqtt.py

@@ -1,175 +0,0 @@
-"""
-This platform enables the possibility to control a MQTT alarm.
-
-For more details about this platform, please refer to the documentation at
-https://home-assistant.io/components/alarm_control_panel.mqtt/
-"""
-import asyncio
-import logging
-import re
-
-import voluptuous as vol
-
-from homeassistant.core import callback
-import homeassistant.components.alarm_control_panel as alarm
-from homeassistant.components import mqtt
-from homeassistant.const import (
-    STATE_ALARM_ARMED_AWAY, STATE_ALARM_ARMED_HOME, STATE_ALARM_DISARMED,
-    STATE_ALARM_PENDING, STATE_ALARM_TRIGGERED, STATE_UNKNOWN,
-    CONF_NAME, CONF_CODE)
-from homeassistant.components.mqtt import (
-    CONF_AVAILABILITY_TOPIC, CONF_STATE_TOPIC, CONF_COMMAND_TOPIC,
-    CONF_PAYLOAD_AVAILABLE, CONF_PAYLOAD_NOT_AVAILABLE, CONF_QOS,
-    CONF_RETAIN, MqttAvailability)
-import homeassistant.helpers.config_validation as cv
-
-_LOGGER = logging.getLogger(__name__)
-
-CONF_PAYLOAD_DISARM = 'payload_disarm'
-CONF_PAYLOAD_ARM_HOME = 'payload_arm_home'
-CONF_PAYLOAD_ARM_AWAY = 'payload_arm_away'
-
-DEFAULT_ARM_AWAY = 'ARM_AWAY'
-DEFAULT_ARM_HOME = 'ARM_HOME'
-DEFAULT_DISARM = 'DISARM'
-DEFAULT_NAME = 'MQTT Alarm'
-DEPENDENCIES = ['mqtt']
-
-PLATFORM_SCHEMA = mqtt.MQTT_BASE_PLATFORM_SCHEMA.extend({
-    vol.Required(CONF_COMMAND_TOPIC): mqtt.valid_publish_topic,
-    vol.Required(CONF_STATE_TOPIC): mqtt.valid_subscribe_topic,
-    vol.Optional(CONF_CODE): cv.string,
-    vol.Optional(CONF_NAME, default=DEFAULT_NAME): cv.string,
-    vol.Optional(CONF_PAYLOAD_ARM_AWAY, default=DEFAULT_ARM_AWAY): cv.string,
-    vol.Optional(CONF_PAYLOAD_ARM_HOME, default=DEFAULT_ARM_HOME): cv.string,
-    vol.Optional(CONF_PAYLOAD_DISARM, default=DEFAULT_DISARM): cv.string,
-}).extend(mqtt.MQTT_AVAILABILITY_SCHEMA.schema)
-
-
-@asyncio.coroutine
-def async_setup_platform(hass, config, async_add_entities,
-                         discovery_info=None):
-    """Set up the MQTT Alarm Control Panel platform."""
-    if discovery_info is not None:
-        config = PLATFORM_SCHEMA(discovery_info)
-
-    async_add_entities([MqttAlarm(
-        config.get(CONF_NAME),
-        config.get(CONF_STATE_TOPIC),
-        config.get(CONF_COMMAND_TOPIC),
-        config.get(CONF_QOS),
-        config.get(CONF_RETAIN),
-        config.get(CONF_PAYLOAD_DISARM),
-        config.get(CONF_PAYLOAD_ARM_HOME),
-        config.get(CONF_PAYLOAD_ARM_AWAY),
-        config.get(CONF_CODE),
-        config.get(CONF_AVAILABILITY_TOPIC),
-        config.get(CONF_PAYLOAD_AVAILABLE),
-        config.get(CONF_PAYLOAD_NOT_AVAILABLE))])
-
-
-class MqttAlarm(MqttAvailability, alarm.AlarmControlPanel):
-    """Representation of a MQTT alarm status."""
-
-    def __init__(self, name, state_topic, command_topic, qos, retain,
-                 payload_disarm, payload_arm_home, payload_arm_away, code,
-                 availability_topic, payload_available, payload_not_available):
-        """Init the MQTT Alarm Control Panel."""
-        super().__init__(availability_topic, qos, payload_available,
-                         payload_not_available)
-        self._state = STATE_UNKNOWN
-        self._name = name
-        self._state_topic = state_topic
-        self._command_topic = command_topic
-        self._qos = qos
-        self._retain = retain
-        self._payload_disarm = payload_disarm
-        self._payload_arm_home = payload_arm_home
-        self._payload_arm_away = payload_arm_away
-        self._code = code
-
-    @asyncio.coroutine
-    def async_added_to_hass(self):
-        """Subscribe mqtt events."""
-        yield from super().async_added_to_hass()
-
-        @callback
-        def message_received(topic, payload, qos):
-            """Run when new MQTT message has been received."""
-            if payload not in (STATE_ALARM_DISARMED, STATE_ALARM_ARMED_HOME,
-                               STATE_ALARM_ARMED_AWAY, STATE_ALARM_PENDING,
-                               STATE_ALARM_TRIGGERED):
-                _LOGGER.warning("Received unexpected payload: %s", payload)
-                return
-            self._state = payload
-            self.async_schedule_update_ha_state()
-
-        yield from mqtt.async_subscribe(
-            self.hass, self._state_topic, message_received, self._qos)
-
-    @property
-    def should_poll(self):
-        """No polling needed."""
-        return False
-
-    @property
-    def name(self):
-        """Return the name of the device."""
-        return self._name
-
-    @property
-    def state(self):
-        """Return the state of the device."""
-        return self._state
-
-    @property
-    def code_format(self):
-        """Return one or more digits/characters."""
-        if self._code is None:
-            return None
-        if isinstance(self._code, str) and re.search('^\\d+$', self._code):
-            return 'Number'
-        return 'Any'
-
-    @asyncio.coroutine
-    def async_alarm_disarm(self, code=None):
-        """Send disarm command.
-
-        This method is a coroutine.
-        """
-        if not self._validate_code(code, 'disarming'):
-            return
-        mqtt.async_publish(
-            self.hass, self._command_topic, self._payload_disarm, self._qos,
-            self._retain)
-
-    @asyncio.coroutine
-    def async_alarm_arm_home(self, code=None):
-        """Send arm home command.
-
-        This method is a coroutine.
-        """
-        if not self._validate_code(code, 'arming home'):
-            return
-        mqtt.async_publish(
-            self.hass, self._command_topic, self._payload_arm_home, self._qos,
-            self._retain)
-
-    @asyncio.coroutine
-    def async_alarm_arm_away(self, code=None):
-        """Send arm away command.
-
-        This method is a coroutine.
-        """
-        if not self._validate_code(code, 'arming away'):
-            return
-        mqtt.async_publish(
-            self.hass, self._command_topic, self._payload_arm_away, self._qos,
-            self._retain)
-
-    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/nx584.py

@@ -1,120 +0,0 @@
-"""
-Support for NX584 alarm control panels.
-
-For more details about this platform, please refer to the documentation at
-https://home-assistant.io/components/alarm_control_panel.nx584/
-"""
-import logging
-
-import requests
-import voluptuous as vol
-
-import homeassistant.components.alarm_control_panel as alarm
-from homeassistant.components.alarm_control_panel import PLATFORM_SCHEMA
-from homeassistant.const import (
-    CONF_HOST, CONF_NAME, CONF_PORT, STATE_ALARM_ARMED_AWAY,
-    STATE_ALARM_ARMED_HOME, STATE_ALARM_DISARMED, STATE_UNKNOWN)
-import homeassistant.helpers.config_validation as cv
-
-REQUIREMENTS = ['pynx584==0.4']
-
-_LOGGER = logging.getLogger(__name__)
-
-DEFAULT_HOST = 'localhost'
-DEFAULT_NAME = 'NX584'
-DEFAULT_PORT = 5007
-
-PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
-    vol.Optional(CONF_HOST, default=DEFAULT_HOST): cv.string,
-    vol.Optional(CONF_NAME, default=DEFAULT_NAME): cv.string,
-    vol.Optional(CONF_PORT, default=DEFAULT_PORT): cv.port,
-})
-
-
-def setup_platform(hass, config, add_entities, discovery_info=None):
-    """Set up the NX584 platform."""
-    name = config.get(CONF_NAME)
-    host = config.get(CONF_HOST)
-    port = config.get(CONF_PORT)
-
-    url = 'http://{}:{}'.format(host, port)
-
-    try:
-        add_entities([NX584Alarm(hass, url, name)])
-    except requests.exceptions.ConnectionError as ex:
-        _LOGGER.error("Unable to connect to NX584: %s", str(ex))
-        return False
-
-
-class NX584Alarm(alarm.AlarmControlPanel):
-    """Representation of a NX584-based alarm panel."""
-
-    def __init__(self, hass, url, name):
-        """Init the nx584 alarm panel."""
-        from nx584 import client
-        self._hass = hass
-        self._name = name
-        self._url = url
-        self._alarm = client.Client(self._url)
-        # Do an initial list operation so that we will try to actually
-        # talk to the API and trigger a requests exception for setup_platform()
-        # to catch
-        self._alarm.list_zones()
-        self._state = STATE_UNKNOWN
-
-    @property
-    def name(self):
-        """Return the name of the device."""
-        return self._name
-
-    @property
-    def code_format(self):
-        """Return one or more digits/characters."""
-        return 'Number'
-
-    @property
-    def state(self):
-        """Return the state of the device."""
-        return self._state
-
-    def update(self):
-        """Process new events from panel."""
-        try:
-            part = self._alarm.list_partitions()[0]
-            zones = self._alarm.list_zones()
-        except requests.exceptions.ConnectionError as ex:
-            _LOGGER.error("Unable to connect to %(host)s: %(reason)s",
-                          dict(host=self._url, reason=ex))
-            self._state = STATE_UNKNOWN
-            zones = []
-        except IndexError:
-            _LOGGER.error("NX584 reports no partitions")
-            self._state = STATE_UNKNOWN
-            zones = []
-
-        bypassed = False
-        for zone in zones:
-            if zone['bypassed']:
-                _LOGGER.debug("Zone %(zone)s is bypassed, assuming HOME",
-                              dict(zone=zone['number']))
-                bypassed = True
-                break
-
-        if not part['armed']:
-            self._state = STATE_ALARM_DISARMED
-        elif bypassed:
-            self._state = STATE_ALARM_ARMED_HOME
-        else:
-            self._state = STATE_ALARM_ARMED_AWAY
-
-    def alarm_disarm(self, code=None):
-        """Send disarm command."""
-        self._alarm.disarm(code)
-
-    def alarm_arm_home(self, code=None):
-        """Send arm home command."""
-        self._alarm.arm('stay')
-
-    def alarm_arm_away(self, code=None):
-        """Send arm away command."""
-        self._alarm.arm('exit')

homeassistant/components/alarm_control_panel/satel_integra.py

@@ -1,94 +0,0 @@
-"""
-Support for Satel Integra alarm, using ETHM module: https://www.satel.pl/en/ .
-
-For more details about this platform, please refer to the documentation at
-https://home-assistant.io/components/alarm_control_panel.satel_integra/
-"""
-import asyncio
-import logging
-
-import homeassistant.components.alarm_control_panel as alarm
-from homeassistant.components.satel_integra import (
-    CONF_ARM_HOME_MODE, DATA_SATEL, SIGNAL_PANEL_MESSAGE)
-from homeassistant.core import callback
-from homeassistant.helpers.dispatcher import async_dispatcher_connect
-
-_LOGGER = logging.getLogger(__name__)
-
-DEPENDENCIES = ['satel_integra']
-
-
-@asyncio.coroutine
-def async_setup_platform(hass, config, async_add_entities,
-                         discovery_info=None):
-    """Set up for Satel Integra alarm panels."""
-    if not discovery_info:
-        return
-
-    device = SatelIntegraAlarmPanel(
-        "Alarm Panel", discovery_info.get(CONF_ARM_HOME_MODE))
-    async_add_entities([device])
-
-
-class SatelIntegraAlarmPanel(alarm.AlarmControlPanel):
-    """Representation of an AlarmDecoder-based alarm panel."""
-
-    def __init__(self, name, arm_home_mode):
-        """Initialize the alarm panel."""
-        self._name = name
-        self._state = None
-        self._arm_home_mode = arm_home_mode
-
-    @asyncio.coroutine
-    def async_added_to_hass(self):
-        """Register callbacks."""
-        async_dispatcher_connect(
-            self.hass, SIGNAL_PANEL_MESSAGE, self._message_callback)
-
-    @callback
-    def _message_callback(self, message):
-        """Handle received messages."""
-        if message != self._state:
-            self._state = message
-            self.async_schedule_update_ha_state()
-        else:
-            _LOGGER.warning("Ignoring alarm status message, same state")
-
-    @property
-    def name(self):
-        """Return the name of the device."""
-        return self._name
-
-    @property
-    def should_poll(self):
-        """Return the polling state."""
-        return False
-
-    @property
-    def code_format(self):
-        """Return the regex for code format or None if no code is required."""
-        return 'Number'
-
-    @property
-    def state(self):
-        """Return the state of the device."""
-        return self._state
-
-    @asyncio.coroutine
-    def async_alarm_disarm(self, code=None):
-        """Send disarm command."""
-        if code:
-            yield from self.hass.data[DATA_SATEL].disarm(code)
-
-    @asyncio.coroutine
-    def async_alarm_arm_away(self, code=None):
-        """Send arm away command."""
-        if code:
-            yield from self.hass.data[DATA_SATEL].arm(code)
-
-    @asyncio.coroutine
-    def async_alarm_arm_home(self, code=None):
-        """Send arm home command."""
-        if code:
-            yield from self.hass.data[DATA_SATEL].arm(
-                code, self._arm_home_mode)

homeassistant/components/alarm_control_panel/services.yaml

@@ -79,3 +79,55 @@ ifttt_push_alarm_state:
     state:
       description: The state to which the alarm control panel has to be set.
       example: 'armed_night'
+
+elkm1_alarm_arm_vacation:
+  description: Arm the ElkM1 in vacation mode.
+  fields:
+    entity_id:
+      description: Name of alarm control panel to arm.
+      example: 'alarm_control_panel.main'
+    code:
+      description: An code to arm the alarm control panel.
+      example: 1234
+
+elkm1_alarm_arm_home_instant:
+  description: Arm the ElkM1 in home instant mode.
+  fields:
+    entity_id:
+      description: Name of alarm control panel to arm.
+      example: 'alarm_control_panel.main'
+    code:
+      description: An code to arm the alarm control panel.
+      example: 1234
+
+elkm1_alarm_arm_night_instant:
+  description: Arm the ElkM1 in night instant mode.
+  fields:
+    entity_id:
+      description: Name of alarm control panel to arm.
+      example: 'alarm_control_panel.main'
+    code:
+      description: An code to arm the alarm control panel.
+      example: 1234
+
+elkm1_alarm_display_message:
+  description: Display a message on all of the ElkM1 keypads for an area.
+  fields:
+    entity_id:
+      description: Name of alarm control panel to display messages on.
+      example: 'alarm_control_panel.main'
+    clear:
+      description: 0=clear message, 1=clear message with * key, 2=Display until timeout; default 2
+      example: 1
+    beep:
+      description: 0=no beep, 1=beep; default 0
+      example: 1
+    timeout:
+      description: Time to display message, 0=forever, max 65535, default 0
+      example: 4242
+    line1:
+      description: Up to 16 characters of text (truncated if too long). Default blank.
+      example: The answer to life,
+    line2:
+      description: Up to 16 characters of text (truncated if too long). Default blank.
+      example: the universe, and everything.

homeassistant/components/alarm_control_panel/simplisafe.py

@@ -1,145 +0,0 @@
-"""
-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 re
-
-import voluptuous as vol
-
-from homeassistant.components.alarm_control_panel import (
-    PLATFORM_SCHEMA, AlarmControlPanel)
-from homeassistant.const import (
-    CONF_CODE, CONF_NAME, CONF_PASSWORD, CONF_USERNAME,
-    STATE_ALARM_ARMED_AWAY, STATE_ALARM_ARMED_HOME,
-    STATE_ALARM_DISARMED, STATE_UNKNOWN)
-import homeassistant.helpers.config_validation as cv
-
-REQUIREMENTS = ['simplisafe-python==2.0.2']
-
-_LOGGER = logging.getLogger(__name__)
-
-DEFAULT_NAME = 'SimpliSafe'
-
-ATTR_ALARM_ACTIVE = "alarm_active"
-ATTR_TEMPERATURE = "temperature"
-
-PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
-    vol.Required(CONF_PASSWORD): cv.string,
-    vol.Required(CONF_USERNAME): cv.string,
-    vol.Optional(CONF_CODE): cv.string,
-    vol.Optional(CONF_NAME, default=DEFAULT_NAME): cv.string,
-})
-
-
-def setup_platform(hass, config, add_entities, discovery_info=None):
-    """Set up the SimpliSafe platform."""
-    from simplipy.api import SimpliSafeApiInterface, SimpliSafeAPIException
-    name = config.get(CONF_NAME)
-    code = config.get(CONF_CODE)
-    username = config.get(CONF_USERNAME)
-    password = config.get(CONF_PASSWORD)
-
-    try:
-        simplisafe = SimpliSafeApiInterface(username, password)
-    except SimpliSafeAPIException:
-        _LOGGER.error("Failed to set up SimpliSafe")
-        return
-
-    systems = []
-
-    for system in simplisafe.get_systems():
-        systems.append(SimpliSafeAlarm(system, name, code))
-
-    add_entities(systems)
-
-
-class SimpliSafeAlarm(AlarmControlPanel):
-    """Representation of a SimpliSafe alarm."""
-
-    def __init__(self, simplisafe, name, code):
-        """Initialize the SimpliSafe alarm."""
-        self.simplisafe = simplisafe
-        self._name = name
-        self._code = str(code) if code else None
-
-    @property
-    def unique_id(self):
-        """Return the unique ID."""
-        return self.simplisafe.location_id
-
-    @property
-    def name(self):
-        """Return the name of the device."""
-        if self._name is not None:
-            return self._name
-        return 'Alarm {}'.format(self.simplisafe.location_id)
-
-    @property
-    def code_format(self):
-        """Return one or more digits/characters."""
-        if self._code is None:
-            return None
-        if isinstance(self._code, str) and re.search('^\\d+$', self._code):
-            return 'Number'
-        return 'Any'
-
-    @property
-    def state(self):
-        """Return the state of the device."""
-        status = self.simplisafe.state
-        if status.lower() == 'off':
-            state = STATE_ALARM_DISARMED
-        elif status.lower() == 'home' or status.lower() == 'home_count':
-            state = STATE_ALARM_ARMED_HOME
-        elif (status.lower() == 'away' or status.lower() == 'exitDelay' or
-              status.lower() == 'away_count'):
-            state = STATE_ALARM_ARMED_AWAY
-        else:
-            state = STATE_UNKNOWN
-        return state
-
-    @property
-    def device_state_attributes(self):
-        """Return the state attributes."""
-        attributes = {}
-
-        attributes[ATTR_ALARM_ACTIVE] = self.simplisafe.alarm_active
-        if self.simplisafe.temperature is not None:
-            attributes[ATTR_TEMPERATURE] = self.simplisafe.temperature
-
-        return attributes
-
-    def update(self):
-        """Update alarm status."""
-        self.simplisafe.update()
-
-    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")
-
-    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")
-
-    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")
-
-    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