Merge pull request #27 from zevv/nimbleStructure

Nimble structure - remove warnings

Author: ThomasTJdev

.gitignore

@@ -1,5 +1,2 @@
-test/tester
-nmqtt
-nmqtt_password
-nmqtt_pub
-nmqtt_sub
+tests/tester
+bin

src/config/nmqtt.conf config/nmqtt.confsrc/config/nmqtt.conf renamed to config/nmqtt.conf

@@ -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"

src/nmqtt.nim nmqtt.nimsrc/nmqtt.nim renamed to nmqtt.nim

@@ -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

nmqtt.nimble

@@ -0,0 +1 @@
+include "../nmqtt.nim"

src/config.nims nmqtt/config.nimssrc/config.nims renamed to nmqtt/config.nims

@@ -4,7 +4,7 @@ from os import getCurrentProcessId
 
 import utils/version
 
-include "nmqtt.nim"
+include "../nmqtt.nim"
 
 
 proc handler() {.noconv.} =

nmqtt/nmqtt.nim

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