Remove compiler and use nimscript with nim e instead

.travis.yml

@@ -1,24 +1,24 @@
 os:
   - linux
-dist: trusty
+  - osx
 
 language: c
 
+env:
+  - BRANCH=0.19.4
+  - BRANCH=devel
+
 cache:
   directories:
-    - "$HOME/.nimble"
-    - "$HOME/.choosenim"
+    - "$HOME/.choosenim/toolchains/nim-0.19.4"
 
 install:
-  - export CHOOSENIM_CHOOSE_VERSION="#7bb93c730ea87f"
-  - export NIM_LIB_PREFIX="$HOME/.choosenim/toolchains/nim-"$CHOOSENIM_CHOOSE_VERSION
+  - export CHOOSENIM_CHOOSE_VERSION=$BRANCH
   - |
       curl https://nim-lang.org/choosenim/init.sh -sSf > init.sh
       sh init.sh -y
 
 before_script:
-  - set -e
-  - set -x
   - export CHOOSENIM_NO_ANALYTICS=1
   - export PATH=$HOME/.nimble/bin:$PATH
 

nimble.nimble

@@ -1,7 +1,9 @@
-import ospaths
-template thisModuleFile: string = instantiationInfo(fullPaths = true).filename
+import strutils
 
-when fileExists(thisModuleFile.parentDir / "src/nimblepkg/common.nim"):
+const
+  parentDir = currentSourcePath.rsplit(seps={'/', '\\', ':'}, maxsplit=1)[0]
+
+when fileExists(parentDir & "/src/nimblepkg/common.nim"):
   # In the git repository the Nimble sources are in a ``src`` directory.
   import src/nimblepkg/common
 else:
@@ -21,7 +23,7 @@ installExt = @["nim"]
 
 # Dependencies
 
-requires "nim >= 0.13.0", "compiler#head"
+requires "nim >= 0.13.0"
 
 when defined(nimdistros):
   import distros

src/nimble.nim

@@ -16,7 +16,7 @@ import nimblepkg/packageinfo, nimblepkg/version, nimblepkg/tools,
        nimblepkg/cli, nimblepkg/packageinstaller, nimblepkg/reversedeps,
        nimblepkg/nimscriptexecutor, nimblepkg/init
 
-import nimblepkg/nimscriptsupport
+import nimblepkg/nimscriptwrapper
 
 proc refresh(options: Options) =
   ## Downloads the package list from the specified URL.
@@ -896,7 +896,7 @@ proc uninstall(options: Options) =
 
 proc listTasks(options: Options) =
   let nimbleFile = findNimbleFile(getCurrentDir(), true)
-  nimscriptsupport.listTasks(nimbleFile, options)
+  nimscriptwrapper.listTasks(nimbleFile, options)
 
 proc developFromDir(dir: string, options: Options) =
   if options.depsOnly:
@@ -1103,7 +1103,7 @@ proc doAction(options: Options) =
       return
     let isPreDefined = options.action.command.normalize == "test"
 
-    var execResult: ExecutionResult[void]
+    var execResult: ExecutionResult[bool]
     if execCustom(options, execResult, failFast=not isPreDefined):
       if execResult.hasTaskRequestedCommand():
         doAction(execResult.getOptionsForCommand(options))

src/nimblepkg/nimscriptapi.nim

@@ -3,6 +3,9 @@
 
 ## This module is implicitly imported in NimScript .nimble files.
 
+import system except getCommand, setCommand, switch, `--`
+import strformat, strutils, tables
+
 var
   packageName* = ""    ## Set this to the package name. It
                        ## is usually not required to do that, nims' filename is
@@ -22,46 +25,157 @@ var
   foreignDeps*: seq[string] = @[] ## The foreign dependencies. Only
                                   ## exported for 'distros.nim'.
 
+  beforeHooks: seq[string] = @[]
+  afterHooks: seq[string] = @[]
+  commandLineParams: seq[string] = @[]
+  flags: TableRef[string, seq[string]]
+
+  command = "e"
+  project = ""
+  success = false
+  retVal = true
+
 proc requires*(deps: varargs[string]) =
   ## Call this to set the list of requirements of your Nimble
   ## package.
   for d in deps: requiresData.add(d)
 
+proc getParams() =
+  for i in 5 .. paramCount():
+    if paramStr(i).len != 0:
+      commandLineParams.add paramStr(i).normalize
+
+proc getCommand(): string =
+  return command
+
+proc setCommand(cmd: string, prj = "") =
+  command = cmd
+  if prj.len != 0:
+    project = prj
+
+proc switch(key: string, value="") =
+  if flags.isNil:
+    flags = newTable[string, seq[string]]()
+
+  if flags.hasKey(key):
+    flags[key].add(value)
+  else:
+    flags[key] = @[value]
+
+template `--`(key, val: untyped) =
+  switch(astToStr(key), strip astToStr(val))
+
+template `--`(key: untyped) =
+  switch(astToStr(key), "")
+
+template printIfLen(varName) =
+  if varName.len != 0:
+    iniOut &= astToStr(varName) & ": \"" & varName & "\"\n"
+
+template printSeqIfLen(varName) =
+  if varName.len != 0:
+    iniOut &= astToStr(varName) & ": \"" & varName.join(", ") & "\"\n"
+
+proc printPkgInfo() =
+  if backend.len == 0:
+    backend = "c"
+
+  var
+    iniOut = "[Package]\n"
+  if packageName.len != 0:
+    iniOut &= "name: \"" & packageName & "\"\n"
+  printIfLen version
+  printIfLen author
+  printIfLen description
+  printIfLen license
+  printIfLen srcdir
+  printIfLen binDir
+  printIfLen backend
+
+  printSeqIfLen skipDirs
+  printSeqIfLen skipFiles
+  printSeqIfLen skipExt
+  printSeqIfLen installDirs
+  printSeqIfLen installFiles
+  printSeqIfLen installExt
+  printSeqIfLen bin
+  printSeqIfLen beforeHooks
+  printSeqIfLen afterHooks
+
+  if requiresData.len != 0:
+    iniOut &= "\n[Deps]\n"
+    iniOut &= &"requires: \"{requiresData.join(\", \")}\"\n"
+
+  echo iniOut
+
+proc onExit() =
+  if "printPkgInfo".normalize in commandLineParams:
+    printPkgInfo()
+  else:
+    var
+      output = ""
+    output &= "\"success\": " & $success & ", "
+    output &= "\"command\": \"" & command & "\", "
+    if project.len != 0:
+      output &= "\"project\": \"" & project & "\", "
+    if not flags.isNil and flags.len != 0:
+      output &= "\"flags\": {"
+      for key, val in flags.pairs:
+        output &= "\"" & key & "\": ["
+        for v in val:
+          output &= "\"" & v & "\", "
+        output = output[0 .. ^3] & "], "
+      output = output[0 .. ^3] & "}, "
+
+    output &= "\"retVal\": " & $retVal
+
+    writeFile(currentSourcePath & ".out", "{" & output & "}")
+
 # TODO: New release of Nim will move this `task` template under a
 # `when not defined(nimble)`. This will allow us to override it in the future.
-when not declared(task):
-  template task*(name: untyped; description: string; body: untyped): untyped =
-    ## Defines a task. Hidden tasks are supported via an empty description.
-    ## Example:
-    ##
-    ## .. code-block:: nim
-    ##  task build, "default build is via the C backend":
-    ##    setCommand "c"
-    proc `name Task`*() = body
-
-    let cmd = getCommand()
-    if cmd.len == 0 or cmd == "help":
-      setCommand "help"
-      echo(astToStr(name), "        ", description)
-    elif cmd == astToStr(name):
-      setCommand "nop"
-      `name Task`()
+template task*(name: untyped; description: string; body: untyped): untyped =
+  ## Defines a task. Hidden tasks are supported via an empty description.
+  ## Example:
+  ##
+  ## .. code-block:: nim
+  ##  task build, "default build is via the C backend":
+  ##    setCommand "c"
+  proc `name Task`*() = body
+
+  if commandLineParams.len == 0 or "help" in commandLineParams:
+    success = true
+    echo(astToStr(name), "        ", description)
+  elif astToStr(name).normalize in commandLineParams:
+    success = true
+    `name Task`()
 
 template before*(action: untyped, body: untyped): untyped =
   ## Defines a block of code which is evaluated before ``action`` is executed.
   proc `action Before`*(): bool =
     result = true
     body
 
+  beforeHooks.add astToStr(action)
+
+  if (astToStr(action) & "Before").normalize in commandLineParams:
+    success = true
+    retVal = `action Before`()
+
 template after*(action: untyped, body: untyped): untyped =
   ## Defines a block of code which is evaluated after ``action`` is executed.
   proc `action After`*(): bool =
     result = true
     body
 
-template builtin = discard
+  afterHooks.add astToStr(action)
+
+  if (astToStr(action) & "After").normalize in commandLineParams:
+    success = true
+    retVal = `action After`()
 
-proc getPkgDir*(): string =
+proc getPkgDir(): string =
   ## Returns the package directory containing the .nimble file currently
   ## being evaluated.
-  builtin
+  result = currentSourcePath.rsplit(seps={'/', '\\', ':'}, maxsplit=1)[0]
+
+getParams()

src/nimblepkg/nimscriptexecutor.nim

@@ -3,7 +3,7 @@
 
 import os, tables, strutils, sets
 
-import packageparser, common, packageinfo, options, nimscriptsupport, cli
+import packageparser, common, packageinfo, options, nimscriptwrapper, cli
 
 proc execHook*(options: Options, before: bool): bool =
   ## Returns whether to continue.
@@ -31,7 +31,7 @@ proc execHook*(options: Options, before: bool): bool =
       result = res.retVal
 
 proc execCustom*(options: Options,
-                 execResult: var ExecutionResult[void],
+                 execResult: var ExecutionResult[bool],
                  failFast = true): bool =
   ## Executes the custom command using the nimscript backend.
   ##