Merge pull request #23 from domoticz/development

merge

Author: szczukot

.travis.yml

@@ -22,9 +22,9 @@ before_install:
   # OpenZWave
   - git clone https://github.com/OpenZWave/open-zwave.git open-zwave-read-only
   - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then
-    brew update;
-    brew upgrade boost;
-    fi
+      brew update;
+      brew upgrade boost;
+    fi;
 
 # Build matrix definition
 # * Two builds
@@ -61,9 +61,12 @@ matrix:
           - libdigest-sha-perl
           - python3-dev
     script:
-      - wget https://dl.bintray.com/boostorg/release/1.67.0/source/boost_1_67_0.tar.gz >> /dev/null 2>&1
-      - tar xfz boost_1_67_0.tar.gz
-      - cd boost_1_67_0/
+      - curl -sSL https://github.com/Kitware/CMake/releases/download/v3.14.3/cmake-3.14.3-Linux-x86_64.tar.gz -o cmake.tar.gz;
+      - sudo tar xf cmake.tar.gz --strip 1 -C /usr/local;
+      - export PATH=/usr/local/bin:$PATH;
+      - wget https://dl.bintray.com/boostorg/release/1.70.0/source/boost_1_70_0.tar.gz >> /dev/null 2>&1
+      - tar xfz boost_1_70_0.tar.gz
+      - cd boost_1_70_0/
       - ./bootstrap.sh
       - ./b2 stage threading=multi link=static --with-thread --with-system --with-chrono >> /dev/null 2>&1
       - sudo ./b2 install threading=multi link=static --with-thread --with-system --with-chrono >> /dev/null 2>&1
@@ -85,6 +88,7 @@ matrix:
   #     - brew link openssl --force
   #     - brew install md5sha1sum
   #     - brew upgrade python
+  #     - brew upgrade cmake
   #     - export OPENSSL_ROOT_DIR=/usr/local/opt/openssl
   #   script:
   #     - CPPFLAGS="-std=c++11" cmake -DCMAKE_BUILD_TYPE=Release -DPYTHON_INCLUDE_DIR=$(python3-config --prefix)/Headers -DPYTHON_LIBRARY=$(python3-config --prefix)/lib/libpython3.6.dylib

CMakeLists.txt

@@ -1,10 +1,10 @@
-#set to minimum version that supports clean build on cygwin
-cmake_minimum_required(VERSION 2.8.4)
+#set to minimum version that supports clean build
+cmake_minimum_required(VERSION 3.14.0)
 
 project(domoticz)
 
 ## required min. libBoost version
-SET(DOMO_MIN_LIBBOOST_VERSION 106000)
+SET(DOMO_MIN_LIBBOOST_VERSION 1.60.0)
 ##
 
 MACRO(Gitversion_GET_REVISION dir variable)
@@ -576,14 +576,16 @@ set(Boost_USE_STATIC_LIBS ${USE_STATIC_BOOST})
 set(Boost_USE_MULTITHREADED ON)
 unset(Boost_INCLUDE_DIR CACHE)
 unset(Boost_LIBRARY_DIRS CACHE)
-find_package(Boost REQUIRED COMPONENTS thread system)
 
 if(USE_STATIC_BOOST)
    message(STATUS "Linking against boost static libraries")
 else(USE_STATIC_BOOST)
    message(STATUS "Linking against boost dynamic libraries")
 endif(USE_STATIC_BOOST)
 
+find_package(Boost REQUIRED COMPONENTS thread system)
+target_link_libraries(domoticz Boost::thread Boost::system)
+
 # compare found vs required libBoost version
 if(Boost_VERSION VERSION_LESS DOMO_MIN_LIBBOOST_VERSION)
    message(FATAL_ERROR "Found libBoost version ${Boost_VERSION}, ${DOMO_MIN_LIBBOOST_VERSION} or newer required")

History.txt

@@ -1,5 +1,13 @@
-Version 4.beta (xx 2019)
+Version 4.xxxxx (xxx 2019)
+- Implemented: DarkSky CloudCover sensor
+- Implemented: EventSystem, option in Settings to enable/disable URL call logging containing full URL path
+
+Version 4.10717 (May 9th 2019)
+- Fixed: dzVents, Allowing no error message for HTTP calls (#3191)
+- Fixed: EcoCompteur now uses the port specified in the hardware setup (#3184)
+- Fixed: Log for Weight sensor (#3192)
 - Fixed: issue with Session ID/Login
+- Fixed: issue with slightly  to large labels for the selector switch (#3187)
 - Updated: dzVents (version 2.4.19, See dzVents/documentation/history.md)
 
 Version 4.10658 (May 5th 2019)

dzVents/documentation/README.md

@@ -548,7 +548,7 @@ The domoticz object holds all information about your Domoticz system. It has glo
     - **fromJSON(json, fallback <sup>2.4.16</sup>)**: *Function*. Turns a json string to a Lua table. Example: `local t = domoticz.utils.fromJSON('{ "a": 1 }')`. Followed by: `print( t.a )` will print 1. Optional 2nd param fallback will be returned if json is nil or invalid.
     - **osExecute(cmd)**: *Function*:  Execute an os command.
     - **round(number, [decimalPlaces])**: *Function*. Helper function to round numbers. Default decimalPlaces is 0.
-    - **stringSplit(string, [separator ])**:<sup>2.4.19</sup> *Function*. Helper function to split a line in separate words. Default separator is space.
+    - **stringSplit(string, [separator ])**:<sup>2.4.19</sup> *Function*. Helper function to split a line in separate words. Default separator is space. Return is a table with separate words.
     - **toCelsius(f, relative)**: *Function*. Converts temperature from Fahrenheit to Celsius along the temperature scale or when relative==true it uses the fact that 1F==0.56C. So `toCelsius(5, true)` returns 5F*(1/1.8) = 2.78C.
     - **toJSON(luaTable)**: *Function*. <sup>2.4.0</sup> Converts a Lua table to a json string.
     - **urlDecode(s)**: <sup>2.4.13</sup> *Function*. Simple deCoder to convert a string with escaped chars (%20, %3A and the likes) to human readable format

dzVents/documentation/README.wiki

@@ -546,7 +546,7 @@ The domoticz object holds all information about your Domoticz system. It has glo
 ** '''fromJSON(json, fallback <sup>2.4.16</sup>)''': ''Function''. Turns a json string to a Lua table. Example: <code>local t = domoticz.utils.fromJSON('{ &quot;a&quot;: 1 }')</code>. Followed by: <code>print( t.a )</code> will print 1. Optional 2nd param fallback will be returned if json is nil or invalid.
 ** '''osExecute(cmd)''': ''Function'': Execute an os command.
 ** '''round(number, [decimalPlaces])''': ''Function''. Helper function to round numbers. Default decimalPlaces is 0.
-** '''stringSplit(string, [separator ])''':<sup>2.4.19</sup> ''Function''. Helper function to split a line in separate words. Default separator is space.
+** '''stringSplit(string, [separator ])''':<sup>2.4.19</sup> ''Function''. Helper function to split a line in separate words. Default separator is space. Return is a table with separate words.
 ** '''toCelsius(f, relative)''': ''Function''. Converts temperature from Fahrenheit to Celsius along the temperature scale or when relative==true it uses the fact that 1F==0.56C. So <code>toCelsius(5, true)</code> returns 5F*(1/1.8) = 2.78C.
 ** '''toJSON(luaTable)''': ''Function''. <sup>2.4.0</sup> Converts a Lua table to a json string.
 ** '''urlDecode(s)''': <sup>2.4.13</sup> ''Function''. Simple deCoder to convert a string with escaped chars (%20, %3A and the likes) to human readable format

dzVents/runtime/Domoticz.lua

@@ -205,6 +205,10 @@ local function Domoticz(settings)
 			dumpTable = function(t, level)
 				return utils.dumpTable(t, level)
 			end,
+
+			stringSplit = function(text, sep)
+				return utils.stringSplit(text, sep)
+			end,
 
 		}
 	}

dzVents/runtime/HTTPResponse.lua

@@ -9,14 +9,19 @@ local function HTTPResponce(domoticz, responseData)
 	self.baseType = domoticz.BASETYPE_HTTP_RESPONSE
 	self.data = responseData.data
 	self._contentType = _.get(self.headers, {'Content-Type'}, '')
-    
-    self.isJSON = false
+	
+	self.isJSON = false
 
-    self.statusText = responseData.statusText
-    self.protocol = responseData.protocol
-    self.statusCode = responseData.statusCode
-    
-    self.ok = ( self.statusCode >= 200 and self.statusCode <= 299 )
+	self.statusText = responseData.statusText
+	self.protocol = responseData.protocol
+	self.statusCode = responseData.statusCode
+	
+	if self.statusCode >= 200 and self.statusCode <= 299 then
+		self.ok = true
+	else
+		self.ok = false
+		domoticz.log(self.protocol .. " response: " .. self.statusCode .. " ==>> " .. self.statusText ,domoticz.LOG_ERROR)
+	end	
 
 	self.isHTTPResponse = true
 	self.isDevice = false
@@ -37,6 +42,7 @@ local function HTTPResponce(domoticz, responseData)
 			self.json = json
 		end
 	end
+	
 	return self
 end
 

dzVents/runtime/device-adapters/rgbw_device.lua

@@ -155,7 +155,7 @@ return {
 				return false
 			end
 			if not(hue) or not(inRange(hue, 0, 360)) then
-				domoticz.log('Brightness value need to be number from 0-100', utils.LOG_ERROR)
+				domoticz.log('hue value need to be number from 0-360', utils.LOG_ERROR)
 				return false
 			end
 			if isWhite and type(isWhite) ~= "boolean" then

dzVents/runtime/tests/testDomoticz.lua

@@ -985,4 +985,22 @@ describe('Domoticz', function()
 		}, domoticz.utils.fromJSON(json))
 	end)
 
+	it('should convert a table to json', function()
+		local t = { a= 1 }
+		local res = domoticz.utils.toJSON(t)
+		assert.is_same('{"a":1}', res)
+	end)
+	
+	it('should dump a table to log', function()
+		local t = { a=1,b=2,c={d=3,e=4, "test"} }
+		local res = domoticz.utils.dumpTable(t,"> ")
+		assert.is_nil(res)
+	end)
+
+	it('should split a string ', function()
+		assert.is_same(domoticz.utils.stringSplit("A-B-C", "-")[2],"B")
+		assert.is_same(domoticz.utils.stringSplit("I forgot to include this in Domoticz.lua")[7],"Domoticz.lua")
+	end)
+
+
 end)

dzVents/runtime/tests/testHTTPResponse.lua

@@ -49,24 +49,41 @@ describe('HTTPResponse', function()
 		assert.is_true(r.ok)
 	end)
 
-    it('should have a valid statuscode', function()
+	it('should have a valid statuscode', function()
 
 		local r = HTTPResponse({
 			BASETYPE_HTTP_RESPONSE = 'httpResponse'
 		}, {
 			headers = {['Content-Type'] = 'application/json' },
-            statusText = 'Empty response' ,
-            protocol = 'HTTP/1.4' ,
-            statusCode  = 404 ,
+			statusText = 'Empty response' ,
+			protocol = 'HTTP/1.4' ,
+			statusCode  = 404 ,
 			data  = '{"a":1}',
 			callback = 'trigger1',
-            
+			
+			
+		})
+		assert.is_same('HTTP/1.4', r.protocol)
+		assert.is_same(404, r.statusCode)
+		assert.is_false(r.ok)
+		assert.is.same('Empty response',r.statusText)
+	end)
+		
+		it('should have a valid statustext', function()
+
+		local r = HTTPResponse({
+			BASETYPE_HTTP_RESPONSE = 'httpResponse'
+		}, {
+			headers = {['Content-Type'] = 'application/json' },
+			data  = '{"a":1}',
+			callback = 'trigger1',
+			
 
 		})
-        assert.is_same('HTTP/1.4', r.protocol)
-        assert.is_same(404, r.statusCode)
+		assert.is_same('', r.protocol)
+		assert.is_same(0,r.statusCode)
 		assert.is_false(r.ok)
-        assert.is.same('Empty response',r.statusText)
+		assert.is_same('',r.statusText)
 	end)
 
 end)