python36 · ThomasTJdev · Apr 26, 2020 · Apr 26, 2020 · Apr 26, 2020 · Apr 26, 2020
diff --git a/.gitignore b/.gitignore
@@ -1,5 +1,2 @@
-test/tester
-nmqtt
-nmqtt_password
-nmqtt_pub
-nmqtt_sub
+tests/tester
+bin
diff --git a/src/config/nmqtt.conf → config/nmqtt.conf b/src/config/nmqtt.conf → config/nmqtt.conf
diff --git a/src/nmqtt.nim → nmqtt.nim b/src/nmqtt.nim → nmqtt.nim
@@ -15,8 +15,8 @@ when defined(broker):
     sequtils,
     times,
     random,
-    utils/passwords,
-    utils/version
+    nmqtt/utils/passwords,
+    nmqtt/utils/version
   from parsecfg import loadConfig, getSectionValue
   from os import fileExists
 
@@ -1191,4 +1191,4 @@ proc msgQueue*(ctx: MqttCtx): int =
 
 
 when defined(broker):
-  include "utils/broker.nim"
+  include "nmqtt/utils/broker.nim"
diff --git a/nmqtt.nimble b/nmqtt.nimble
@@ -1,14 +1,13 @@
 # Package
-version       = "1.0.0"
+version       = "1.0.1"
 author        = "zevv & ThomasTJdev"
 description   = "Native MQTT library and binaries for publishing, subscribing and broker"
 license       = "MIT"
-srcDir        = "src"
+bin           = @["nmqtt/nmqtt", "nmqtt/nmqtt_password", "nmqtt/nmqtt_pub", "nmqtt/nmqtt_sub"]
 binDir        = "bin"
 installFiles  = @["nmqtt.nim"]
 installDirs   = @["config"]
-bin           = @["nmqtt", "nmqtt_password", "nmqtt_pub", "nmqtt_sub"]
-
+skipDirs      = @["tests", "nmqtt"]
 
 # Dependencies
 requires "nim >= 1.0.6"
@@ -19,7 +18,7 @@ from strutils import format
 
 
 task test, "Runs the test suite.":
-  exec "nimble c -y -r test/tester"
+  exec "nimble c -y -r tests/tester"
 
 
 after install:
@@ -53,7 +52,7 @@ Access the nim-libary with an import statement in your code:
 
 
 BINARIES:
-Access the binaries directly with. For help append `--help`.
+Access the binaries directly with the commands below. For help append `--help`.
 
   nmqtt
   nmqtt_password

diff --git a/src/config.nims → nmqtt/config.nims b/src/config.nims → nmqtt/config.nims
diff --git a/nmqtt/nmqtt.nim b/nmqtt/nmqtt.nim
@@ -0,0 +1 @@
+include "../nmqtt.nim"
diff --git a/src/nmqtt.nim.cfg → nmqtt/nmqtt.nim.cfg b/src/nmqtt.nim.cfg → nmqtt/nmqtt.nim.cfg
diff --git a/src/nmqtt_password.nim → nmqtt/nmqtt_password.nim b/src/nmqtt_password.nim → nmqtt/nmqtt_password.nim
diff --git a/src/nmqtt_pub.nim → nmqtt/nmqtt_pub.nim b/src/nmqtt_pub.nim → nmqtt/nmqtt_pub.nim
@@ -4,7 +4,7 @@ from os import getCurrentProcessId
 
 import utils/version
 
-include "nmqtt.nim"
+include "../nmqtt.nim"
 
 
 proc handler() {.noconv.} =

diff --git a/src/nmqtt_sub.nim → nmqtt/nmqtt_sub.nim b/src/nmqtt_sub.nim → nmqtt/nmqtt_sub.nim
@@ -5,7 +5,7 @@ from strutils import split
 
 import utils/version
 
-include "nmqtt.nim"
+include "../nmqtt.nim"
 
 
 let ctx = newMqttCtx("nmqttsub-" & $getCurrentProcessId())

diff --git a/src/utils/broker.nim → nmqtt/utils/broker.nim b/src/utils/broker.nim → nmqtt/utils/broker.nim
diff --git a/src/utils/passwords.nim → nmqtt/utils/passwords.nim b/src/utils/passwords.nim → nmqtt/utils/passwords.nim
diff --git a/src/utils/version.nim → nmqtt/utils/version.nim b/src/utils/version.nim → nmqtt/utils/version.nim
@@ -3,7 +3,7 @@ from strutils import replace, splitLines, split, contains
 from os import `/`
 
 macro nimbleVersion(): void =
-  let n = staticRead(currentSourcePath().replace("/src/utils/version.nim") / "nmqtt.nimble")
+  let n = staticRead(currentSourcePath().replace("/nmqtt/utils/version.nim") / "nmqtt.nimble")
   var v: string
   for line in n.splitLines:
     let l = split(line, " = ")

diff --git a/test/connection.nim → tests/connection.nim b/test/connection.nim → tests/connection.nim
diff --git a/test/ping.nim → tests/ping.nim b/test/ping.nim → tests/ping.nim
diff --git a/test/publish.nim → tests/publish.nim b/test/publish.nim → tests/publish.nim
diff --git a/test/publish_qos.nim → tests/publish_qos.nim b/test/publish_qos.nim → tests/publish_qos.nim
diff --git a/test/publish_retained.nim → tests/publish_retained.nim b/test/publish_retained.nim → tests/publish_retained.nim
diff --git a/test/subscribe.nim → tests/subscribe.nim b/test/subscribe.nim → tests/subscribe.nim
diff --git a/test/tester.nim → tests/tester.nim b/test/tester.nim → tests/tester.nim
@@ -56,7 +56,7 @@ include "unsubscribe.nim"
 include "publish.nim"
 include "publish_qos.nim"
 include "ping.nim"
-include "utils.nim"
+include "tools.nim"
 include "willmsg.nim"          # Contains retained msgs
 include "publish_retained.nim" # Contains retained msgs
                                #

diff --git a/test/tester.nim.cfg → tests/tester.nim.cfg b/test/tester.nim.cfg → tests/tester.nim.cfg
diff --git a/test/utils.nim → tests/tools.nim b/test/utils.nim → tests/tools.nim
diff --git a/test/unsubscribe.nim → tests/unsubscribe.nim b/test/unsubscribe.nim → tests/unsubscribe.nim
diff --git a/test/willmsg.nim → tests/willmsg.nim b/test/willmsg.nim → tests/willmsg.nim