init.lua - fixed; update tests; update bootstrap; update readme

Author: dedok

README.md

@@ -41,8 +41,7 @@ Key features
 $ git clone https://github.com/tarantool/mqtt.git
 $ cd mqtt
 $ git submodule update --init --recursive
-$ cmake .
-$ make
+$ ./bootstrap.sh
 ```
 
 [Back to content](#content)

bootstrap.sh

@@ -11,8 +11,8 @@ mkdir -p build
 cd build
 
 cmake \
-  -DMOSQUITTO_INCLUDE_DIR=$PWD/third_party/mosquitto/lib/mosquitto.h \
-  -DMOSQUITTO_LIBRARY=$PWD/third_party/mosquitto/build/lib/libmosquitto.so \
+  -DMOSQUITTO_INCLUDE_DIR=$PWD/../third_party/mosquitto/lib/mosquitto.h \
+  -DMOSQUITTO_LIBRARY=$PWD/../third_party/mosquitto/build/lib/libmosquitto.so \
   -DCMAKE_BUILD_TYPE=RelWithDebInfo \
 ../
 

cmake/FindMosquitto.cmake

@@ -12,7 +12,7 @@ endif()
 if (NOT MOSQUITTO_LIBRARY)
   find_library(
     MOSQUITTO_LIBRARY
-    NAMES libmosquitto libmosquitto.so.1 libmosquitto.dylid)
+    NAMES libmosquitto libmosquitto.so* libmosquitto.dylid)
 endif()
 
 include(FindPackageHandleStandardArgs)

mqtt-0.1.rockspec

@@ -22,4 +22,3 @@ external_dependencies = {
 build = {
 	type = "cmake",
 }
-

mqtt/CMakeLists.txt

@@ -1,4 +1,5 @@
 add_library(driver SHARED driver.c)
+message(STATUS ${MOSQUITTO_LIBRARIES})
 target_link_libraries(driver ${MOSQUITTO_LIBRARIES} -rdynamic)
 set_target_properties(driver PROPERTIES PREFIX "" OUTPUT_NAME "driver")
 install(TARGETS driver LIBRARY DESTINATION ${TARANTOOL_INSTALL_LIBDIR}/mqtt)

mqtt/init.lua

@@ -202,7 +202,7 @@ mqtt_mt = {
     --  See
     --    <connect> <opts.auto_reconect>
     --
-    reconnect = function()
+    reconnect = function(self)
       return self.mqtt:reconnect()
     end,
 
@@ -271,7 +271,7 @@ mqtt_mt = {
     --  true or false, emsg
     --
     will_set = function(self, topic, payload, qos, retain)
-      return mqtt:will_set(topic, payload, qos, retain)
+      return self.mqtt:will_set(topic, payload, qos, retain)
     end,
 
     --
@@ -283,7 +283,7 @@ mqtt_mt = {
     --  true or false, emsg
     --
     will_clear = function(self)
-      return mqtt:will_clear()
+      return self.mqtt:will_clear()
     end,
 
     --
@@ -305,7 +305,7 @@ mqtt_mt = {
     --  true or false, emsg
     --
     login_set = function(self, username, password)
-      return mqtt:login_set(username, password)
+      return self.mqtt:login_set(username, password)
     end,
 
     --
@@ -327,7 +327,7 @@ mqtt_mt = {
     --  true or false, emsg
     --
     tls_insecure_set = function(self, value)
-      return mqtt:tls_insecure_set(value)
+      return self.mqtt:tls_insecure_set(value)
     end,
 
     --
@@ -364,7 +364,7 @@ mqtt_mt = {
     --	<insecure_set>
     --
     tls_set = function(self, cafile, capath, certfile, keyfile)
-      return mqtt:tls_set(cafile, capath, certfile, keyfile)
+      return self.mqtt:tls_set(cafile, capath, certfile, keyfile)
     end,
 
     --

test/api.lua

@@ -0,0 +1,26 @@
+package.preload['mqtt.driver'] = './mqtt/driver.so'
+
+local os = require('os')
+
+local mqtt = require('mqtt')
+
+conn = mqtt.new()
+
+conn:connect({host="127.0.0.1", port=1883})
+conn:reconnect()
+conn:subscribe('channel/#')
+conn:unsubscribe('some/topic')
+conn:publish('channel2/messages', TIME, 0, false)
+conn:will_set('some/topic', 'str', 0, false)
+conn:will_clear()
+conn:login_set('user', 'password')
+conn:tls_insecure_set(false)
+--conn:tls_set('file', 'path', 'cert', 'key')
+conn:on_connect(function() end)
+conn:on_publish(function() end)
+conn:on_subscribe(function() end)
+conn:on_unsubscribe(function() end)
+conn:on_disconnect(function() end)
+conn:on_message(function() end)
+
+os.exit(0)

test/run_all.sh

@@ -1,11 +1,12 @@
 #!/bin/bash
 set -e
-mkdir -p $PWD/tests/out
+rm -Rf $PWD/test/out
+mkdir -p $PWD/test/out
 echo '[+] Testing ...'
-[ ! -f $PWD/mqtt/driver.so ] && \
-  ln -s $PWD/build/mqtt/driver.so $PWD/mqtt/driver.so
-for test_case in `ls $PWD/tests | grep -e '$*\.lua'`; do
+rm -Rf $PWD/mqtt/driver.so
+ln -s $PWD/build/mqtt/driver.so $PWD/mqtt/driver.so
+for test_case in `ls $PWD/test | grep -e '$*\.lua'`; do
   echo "[+] Case: $test_case"
-  $PWD/tests/$test_case 2> $PWD/tests/out/$test_case.out
+  tarantool $PWD/test/$test_case 2> $PWD/test/out/$test_case.out
   echo "[+] Case: $test_case -- OK"
 done

third_party/bootstrap.sh

@@ -3,9 +3,6 @@
 cd mosquitto
 mkdir -p build
 cd build
-cmake \
-  -DCMAKE_BUILD_TYPE=RelWithDebInfo
-  -DWITH_SRV=off \
-../
+cmake -DCMAKE_BUILD_TYPE=RelWithDebInfo -DWITH_SRV=off ../
+make libmosquitto
 cd -
-make libmosquitto -C build