Merge pull request #101 from 1technophile/patch-1

Fix PORT assignement

bump_version.sh

@@ -1,5 +1,11 @@
 #!/bin/bash
 current_version=$(git describe --tags --abbrev=0)
+
+function error
+{
+	echo
+	echo "ERROR *** $1"
+}
 if [ "$1" == "-d" ]; then
   do=0
   shift
@@ -15,8 +21,14 @@ if [ "$1" == "" ]; then
 	echo "  Current version: $current_version"
 	echo
 else
+	tm=$(git status --porcelain -- src/TinyMqtt.h | wc -l)
 	echo "Current version: ($current_version)"
 	echo "New version    : ($1)"
+	echo "Take info from : library.properties"
+	if [ "$tm" == "1" ]; then
+		error "You cannot bump version if TinyMqtt.h is modified"
+		exit
+	fi
 	echo -n "Do you want to proceed ? "
 	read a
 	if [ "$a" == "y" ]; then
@@ -24,6 +36,7 @@ else
 		grep $current_version library.properties
 		if [ "$?" == "0" ]; then
 			sed -i "s/$current_version/$1/" library.properties
+			sed -i "s/#define TINY_MQTT_REVISION/#define TINY_MQTT_REVISION \"$1\"/" src/TinyMqtt.h
 
       cp library.json.skeleton library.json
       while ifs= read -r line; do
@@ -47,15 +60,15 @@ else
       sed -i "s/'/\"/g" library.json
       if [ "$do" == "1" ]; then
         echo "Pushing all"
-        git tag $1
         git add library.properties
         git add library.json
         git commit -m "Release $1 $2"
+        git tag $1
         git push
         git push --tags
       fi
 		else
-			echo "Current version does not match library.property version, aborting"
+			error "Current version does not match library.property version, aborting"
 		fi
 	fi
 fi

examples/simple-broker/simple-broker.ino

@@ -1,6 +1,6 @@
 #include "TinyMqtt.h"   // https://github.com/hsaturn/TinyMqtt
 
-const uint16_t PORT 1883;
+const uint16_t PORT = 1883;
 const uint8_t  RETAIN = 10;  // Max retained messages
 
 MqttBroker broker(PORT, RETAIN);

library.json

@@ -1,14 +1,14 @@
 {
     "name": "TinyMqtt",
-    "keywords": "ethernet, mqtt, m2m, iot",
+    "keywords": [ "ethernet, mqtt, m2m, iot" ],
-    "description": "MQTT is a lightweight messaging protocol. This library allows to host a broker or to use a mqtt client in your ESP 8266 or 32 WROOM. It does support MQTT 3.1.1 with QoS",
+    "description": "A lightweight MQTT library for ESP8266 and ESP32, supporting MQTT 3.1.1 with QoS and allowing to create a Mqtt broker",
     "repository": {
         "type": "git",
         "url": "https://github.com/hsaturn/TinyMqtt.git"
     },
     "dependencies":
     { "hsaturn/TinyConsole" : "*" },
-    "version": "1.0.0",
+    "version": "1.1.4",
     "exclude": "",
     "examples": "examples/*/*.ino",
     "frameworks": "arduino",

library.json.skeleton

@@ -1,6 +1,6 @@
 {
     "name": "#name",
-    "keywords": "ethernet, mqtt, m2m, iot",
+    "keywords": [ "ethernet, mqtt, m2m, iot" ],
     "description": "#paragraph",
     "repository": {
         "type": "git",

library.properties

@@ -1,9 +1,9 @@
 name=TinyMqtt
-version=1.0.0
+version=1.1.4
-author=Francois BIOT, HSaturn, <hsaturn@gmail.com>
+author=HSaturn, <hsaturn@gmail.com>
-maintainer=Francois BIOT <hsaturn@gmail.com>
+maintainer=HSaturn <hsaturn@gmail.com>
-sentence=A tiny broker and client library for MQTT messaging.
+sentence=A lightweight broker and client Mqtt library for Arduino and ESP.
-paragraph=MQTT is a lightweight messaging protocol. This library allows to host a broker or to use a mqtt client in your ESP 8266 or 32 WROOM. It does support MQTT 3.1.1 with QoS=0, and is intented to be as smallest as possible, keeping a good efficiency (about 1k msg per second on ESP8266 12F).
+paragraph=TinyMqtt supports MQTT 3.1.1 with QoS and allows to create a Mqtt broker
 category=Communication
 url=https://github.com/hsaturn/TinyMqtt
 architectures=*

src/TinyMqtt.h

@@ -1,6 +1,8 @@
 // vim: ts=2 sw=2 expandtab
 #pragma once
 
+#define TINY_MQTT_REVISION "1.1.3"
+
 #ifndef TINY_MQTT_DEBUG
 #define TINY_MQTT_DEBUG 0
 #endif