update to 1.3.0 (#143)

* fix logic error in overwrite, fixes #116

* upgrade to 1.3

* update versions, changelog

* fix debounce config placement

* Update CHANGELOG.md

CHANGELOG.md

@@ -5,6 +5,16 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/).
 
 This project is versioned based upon the version of [zigbee2mqtt](https://github.com/Koenkk/zigbee2mqtt). The versioning `X.Y.Z` of the stable release of this add-on will track that of zigbee2mqtt. If there are new releases without upgrades to the zigbee2mqtt version (i.e., changes to the add-on that occur between releases of zigbee2mqtt), an additional number will be added to indicate this (`X.Y.Z.A`, where `A` indicates a new versioned release).
 
+## [1.3.0](https://github.com/danielwelch/hassio-zigbee2mqtt/releases/tag/v1.3.0) - 2019-04-08
+### Changed
+- Update zigbee2mqtt to version 1.3.0
+### Added
+- Includes new config option from zigbee2mqtt:
+    - `homeassistant_discovery_topic`
+    - `debounce` (device-specific config)
+### Fixed
+- Fixes logic bug that prevented configuration from being updated via the Hass.io frontend UI.
+
 ## [1.2.1](https://github.com/danielwelch/hassio-zigbee2mqtt/releases/tag/v1.2.1) - 2019-03-10
 ### Changed
 - Update zigbee2mqtt to version 1.2.1

zigbee2mqtt-edge/config.json

@@ -6,12 +6,7 @@
   "auto_uart": true,
   "url": "https://github.com/danielwelch/hassio-zigbee2mqtt",
   "startup": "before",
-  "arch": [
-    "aarch64",
-    "amd64",
-    "armhf",
-    "i386"
-  ],
+  "arch": ["aarch64", "amd64", "armhf", "i386"],
   "boot": "auto",
   "map": ["share:rw"],
   "options": {
@@ -51,6 +46,7 @@
     "last_seen": "str?",
     "elapsed": "bool?",
     "overwrite": "bool?",
+    "homeassistant_discovery_topic": "str?",
     "devices": [
       {
         "id": "str",
@@ -61,7 +57,8 @@
         "occupancy_timeout": "int?",
         "temperature_precision": "int?",
         "humidity_precision": "int?",
-        "pressure_precision": "int?"
+        "pressure_precision": "int?",
+        "debounce": "float?"
       }
     ],
     "network_key": ["int?"]

zigbee2mqtt/Dockerfile

@@ -4,7 +4,7 @@ FROM $BUILD_FROM
 # Add env
 ENV LANG C.UTF-8
 
-ENV ZIGBEE2MQTT_VERSION=1.2.1
+ENV ZIGBEE2MQTT_VERSION=1.3.0
 ENV ARCHIVE=zigbee2mqtt-$ZIGBEE2MQTT_VERSION
 
 COPY requirements.txt /requirements.txt

zigbee2mqtt/config.json

@@ -1,17 +1,12 @@
 {
   "name": "zigbee2mqtt",
-  "version": "1.2.1",
+  "version": "1.3.0",
   "slug": "zigbee2mqtt",
   "description": "Zigbee to MQTT Bridge",
   "auto_uart": true,
   "url": "https://github.com/danielwelch/hassio-zigbee2mqtt",
   "startup": "before",
-  "arch": [
-    "aarch64",
-    "amd64",
-    "armhf",
-    "i386"
-  ],
+  "arch": ["aarch64", "amd64", "armhf", "i386"],
   "boot": "auto",
   "map": ["share:rw"],
   "options": {
@@ -51,6 +46,7 @@
     "last_seen": "str?",
     "elapsed": "bool?",
     "overwrite": "bool?",
+    "homeassistant_discovery_topic": "str?",
     "devices": [
       {
         "id": "str",
@@ -60,7 +56,8 @@
         "occupancy_timeout": "int?",
         "temperature_precision": "int?",
         "humidity_precision": "int?",
-        "pressure_precision": "int?"
+        "pressure_precision": "int?",
+        "debounce": "float?"
       }
     ],
     "network_key": ["int?"]

zigbee2mqtt/set_config.py

@@ -11,7 +11,7 @@ def __init__(self, config, options):
 
     def set_option(self, option_name, category=None, alt_config_name=None):
         # if overwrite is disabled (False), check if set and, if so, skip
-        if self.overwrite:
+        if not self.overwrite:
             name = self._config_name(option_name, alt_config_name)
             if self.get_config(name, category) is not None:
                 return

zigbee2mqtt/test_config.py

@@ -157,15 +157,28 @@ def test_config_disable_overwrite():
     options_path = Path('./zigbee2mqtt/test_hassio_options.json')
     with open(options_path) as f:
         options = json.load(f)
-    # set_option should do nothing when overwrite set to True
-    options["overwrite"] = True
+    # set_option should do nothing when overwrite set to False
+    options["overwrite"] = False
     options["mqtt_base_topic"] = "neversetme"
     cfg = ConfigBuilder({"mqtt": {"base_topic": "zigbee2mqtt"}}, options)
     cfg.set_option(
         'mqtt_base_topic', category='mqtt', alt_config_name='base_topic')
     assert cfg.get_config('base_topic', category="mqtt") == "zigbee2mqtt"
 
 
+def test_config_enable_overwrite():
+    from set_config import ConfigBuilder
+    options_path = Path('./zigbee2mqtt/test_hassio_options.json')
+    with open(options_path) as f:
+        options = json.load(f)
+    options["overwrite"] = True
+    options["mqtt_base_topic"] = "replacewithme"
+    cfg = ConfigBuilder({"mqtt": {"base_topic": "zigbee2mqtt"}}, options)
+    cfg.set_option(
+        'mqtt_base_topic', category='mqtt', alt_config_name='base_topic')
+    assert cfg.get_config('base_topic', category="mqtt") == "replacewithme"
+
+
 def test_config_set_devices_config():
     from set_config import ConfigBuilder
     config = {}