Comment lines feature, remove docopt

README.md

@@ -31,20 +31,25 @@ __Capabilities & Limitations__
 Nimgen supports compiling in C/C++ sources as well as loading in dynamic libraries at this time. Support for static libraries (.a, .lib) are still to come.
 
 To see examples of nimgen in action check out the following wrappers:-
-* [nimbass](https://github.com/genotrance/nimbass) - BASS audio wrapper
-    * download ZIP with headers and binary
-    * link with a dynamic library
-* [nimfuzz](https://github.com/genotrance/nimfuzz) - fts_fuzzy_match wrapper
-    * git checkout
-    * Compile C code into binary
-* [nimssl](https://github.com/genotrance/nimssl) - OpenSSL wrapper 
-    * git sparse checkout
-    * Compile C code into binary
-* [nimssh2](https://github.com/genotrance/nimssh2) - libssh2 wrapper
-    * git sparse checkout
-    * Compile libssh2 in as static binary
+* Link with a dynamic library
+    * [nimbass](https://github.com/genotrance/nimbass) - BASS audio wrapper
+        * download ZIP with headers and binary
 
-Nimgen only supports the ```gcc``` preprocessor at this time. Support for detecting and using other preprocessors is TBD.
+* Compile C code into binary
+    * [nimfuzz](https://github.com/genotrance/nimfuzz) - fts_fuzzy_match wrapper
+        * git checkout
+    * [nimkerberos](https://github.com/genotrance/nimkerberos) - WinKerberos wrapper
+        * git sparse checkout
+    * [nimssl](https://github.com/genotrance/nimssl) - OpenSSL wrapper
+        * git sparse checkout
+    * [libsvm](https://github.com/genotrance/libsvm) - libsvm wrapper
+        * git sparse checkout
+
+* Compile in as static binary
+    * [nimssh2](https://github.com/genotrance/nimssh2) - libssh2 wrapper
+        * git sparse checkout
+
+Nimgen only supports the ```gcc``` preprocessor at this time. Support for detecting and using other preprocessors will be based on interest.
 
 __Config file__
 
@@ -130,6 +135,8 @@ The following keys apply to library source code (before processing) and generate
 
 ```replace``` = string value to replace search string in file
 
+```comment``` = number of lines to comment from search location
+
 __Feedback__
 
 Nimgen is a work in progress and any feedback or suggestions are welcome. It is hosted on [GitHub](https://github.com/genotrance/nimgen) with an MIT license so issues, forks and PRs are most appreciated.

nimgen.nim

@@ -1,4 +1,3 @@
-import docopt
 import nre
 import os
 import ospaths
@@ -31,8 +30,6 @@ Options:
   -f    delete all artifacts and regenerate
 """
 
-let ARGS = docopt(DOC)
-
 # ###
 # Helpers
 
@@ -90,7 +87,7 @@ proc gitReset() =
     discard execProc("git reset --hard HEAD")
 
 proc gitRemotePull(url: string, pull=true) =
-    if dirExists(OUTPUT):
+    if dirExists(OUTPUT/".git"):
         if pull:
             gitReset()
         return
@@ -157,11 +154,11 @@ proc search(file: string): string =
     result = file
     if file.splitFile().ext == ".nim":
         result = getNimout(file)
-    elif not fileExists(result):
+    elif not fileExists(result) and not dirExists(result):
         var found = false
         for inc in INCLUDES:
             result = inc/file
-            if fileExists(result):
+            if fileExists(result) or dirExists(result):
                 found = true
                 break
         if not found:
@@ -232,6 +229,27 @@ proc freplace(file: string, pattern: Regex, repl="") =
             else:
                 content = content.replace(pattern, repl)
 
+proc comment(file: string, pattern: string, numlines: string) =
+    let ext = file.splitFile().ext.toLowerAscii()
+    let cmtchar = if ext == ".nim": "#" else: "//"
+    withFile(file):
+        var idx = content.find(pattern)
+        var num = 0
+        try:
+            num = numlines.parseInt()
+        except ValueError:
+            echo "Bad comment value, should be integer: " & numlines
+        if idx != -1:
+            for i in 0 .. num-1:
+                if idx >= content.len():
+                    break
+                content = content[0..<idx] & cmtchar & content[idx..<content.len()]
+                while idx < content.len():
+                    idx += 1
+                    if content[idx] == '\L':
+                        idx += 1
+                        break
+
 proc compile(dir="", file=""): string =
     proc fcompile(file: string): string =
         return "{.compile: \"$#\".}" % file.replace("\\", "/")
@@ -455,10 +473,11 @@ proc c2nim(fl, outfile, flags, ppflags: string, recurse, inline, preprocess, cta
 
     # Include {.compile.} directives
     for cpl in compile:
-        if getFileInfo(cpl).kind == pcFile:
-            prepend(outfile, compile(file=cpl))
+        let fcpl = search(cpl)
+        if getFileInfo(fcpl).kind == pcFile:
+            prepend(outfile, compile(file=fcpl))
         else:
-            prepend(outfile, compile(dir=cpl))
+            prepend(outfile, compile(dir=fcpl))
 
     # Add any pragmas
     if outpragma != "":
@@ -496,7 +515,7 @@ proc runFile(file: string, cfgin: OrderedTableRef) =
             if action == "create":
                 createDir(file.splitPath().head)
                 writeFile(file, cfg[act])
-            elif action in @["prepend", "append", "replace", "compile", "dynlib", "pragma"] and sfile != "":
+            elif action in @["prepend", "append", "replace", "comment", "compile", "dynlib", "pragma"] and sfile != "":
                 if action == "prepend":
                     if srch != "":
                         prepend(sfile, cfg[act], cfg[srch])
@@ -510,6 +529,9 @@ proc runFile(file: string, cfgin: OrderedTableRef) =
                 elif action == "replace":
                     if srch != "":
                         freplace(sfile, cfg[srch], cfg[act])
+                elif action == "comment":
+                    if srch != "":
+                        comment(sfile, cfg[srch], cfg[act])
                 elif action == "compile":
                     compile.add(cfg[act])
                 elif action == "dynlib":
@@ -567,7 +589,7 @@ proc runCfg(cfg: string) =
         if CONFIG["n.global"].hasKey("output"):
             OUTPUT = CONFIG["n.global"]["output"]
             if dirExists(OUTPUT):
-                if ARGS["-f"]:
+                if "-f" in commandLineParams():
                     try:
                         removeDir(OUTPUT)
                     except OSError:
@@ -632,5 +654,6 @@ proc runCfg(cfg: string) =
 # ###
 # Main loop
 
-for i in ARGS["<file.cfg>"]:
-    runCfg(i)
+for i in commandLineParams():
+    if i != "-f":
+        runCfg(i)

nimgen.nimble

@@ -1,6 +1,6 @@
 # Package
 
-version       = "0.1.3"
+version       = "0.1.4"
 author        = "genotrance"
 description   = "c2nim helper to simplify and automate the wrapping of C libraries"
 license       = "MIT"
@@ -9,7 +9,7 @@ skipDirs = @["tests"]
 
 # Dependencies
 
-requires "nim >= 0.16.0", "c2nim >= 0.9.13", "docopt >= 0.6.5"
+requires "nim >= 0.17.2", "c2nim >= 0.9.13"
 
 bin = @["nimgen"]
 

tests/nimgentest.nims

@@ -1,7 +1,18 @@
+import distros
 import ospaths
 import strutils
 
-for comp in @["nimbass", "nimfuzz", "nimssl", "nimssh2"]:
-    withDir(".."/comp):
-        exec "nimble install -y"
-        exec "nimble test"
+var comps = @["libsvm", "nimbass", "nimfuzz", "nimssl", "nimssh2"]
+if detectOs(Windows):
+    comps.add("nimkerberos")
+
+for comp in comps:
+    if dirExists(".."/comp):
+        exec "nimble uninstall -y " & comp
+        withDir(".."/comp):
+            rmDir(comp)
+            exec "nimble install -y"
+            exec "nimble test"
+
+            exec "nimble install -y"
+            exec "nimble test"