Fix issue/28 (adamcharnock#29)

* added test for reading to json and fix serialisation of scalefactor which is now a field not an int

* version bump

Author: kodonnell

mate3/main.py

@@ -47,7 +47,7 @@ def read(client, args):
             for value in device.fields([Mode.R, Mode.RW]):
                 values[value.field.name] = {
                     "implemented": value.implemented,
-                    "scale_factor": value.scale_factor,
+                    "scale_factor": value.scale_factor.value if value.scale_factor is not None else None,
                     "raw_value": value.raw_value
                     if value.raw_value is None or isinstance(value.raw_value, (str, int, float))
                     else repr(value.raw_value),

mate3/tests/test_cli.py

@@ -3,11 +3,16 @@
 CACHE_PATH = Path(__file__).parent / "known_systems" / "chinezbrun" / "modbus.json"
 
 
-def test_read(script_runner):
+def test_read_txt(script_runner):
     ret = script_runner.run("mate3", "read", f"--cache-path={CACHE_PATH}", "--cache-only")
     assert ret.success
 
 
+def test_read_json(script_runner):
+    ret = script_runner.run("mate3", "read", f"--cache-path={CACHE_PATH}", "--cache-only", "--format", "json")
+    assert ret.success
+
+
 def test_devices(script_runner):
     ret = script_runner.run("mate3", "devices", f"--cache-path={CACHE_PATH}", "--cache-only")
     assert ret.success

pyproject.toml

@@ -5,7 +5,7 @@ to = {format = "setuppy", path = "setup.py"}
 [tool.poetry]
 name = "mate3"
 readme = "README.md"
-version = "0.6.1"
+version = "0.6.2"
 description = "Outback Mate3s Python Library"
 authors = ["Adam Charnock <[email protected]>", "kodonnell <[email protected]>"]
 homepage = "https://github.com/adamcharnock/mate3/"

setup.py

@@ -24,7 +24,7 @@
 setup(
     long_description=readme,
     name='mate3',
-    version='0.6.1',
+    version='0.6.2',
     description='Outback Mate3s Python Library',
     python_requires='==3.*,>=3.7.0',
     project_urls={"homepage": "https://github.com/adamcharnock/mate3/", "repository": "https://github.com/adamcharnock/mate3/"},