Fix tests

Author: ScottPJones

Manifest.toml

@@ -0,0 +1,9 @@
+[[Pkg]]
+uuid = "44cfe95a-1eb2-52ea-b672-e2afdf69b78f"
+
+[[Test]]
+uuid = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
+
+[[APITest]]
+path = "test"
+

Project.save

@@ -1,10 +1,10 @@
-authors = ["ScottPJones <[email protected]>"]
-desc = "Tools to help build a consistent API across various packages, use it, and enquire about it"
-keywords = ["package", "module", "API"]
-license = "MIT"
 name = "ModuleInterfaceTools"
 uuid = "5cb8414e-7aab-5a03-a681-351269c074bf"
+keywords = ["package", "module", "API"]
+license = "MIT"
+desc = "Tools to help build a consistent API across various packages, use it, and enquire about it"
+authors = ["ScottPJones <[email protected]>"]
 
 [deps]
-Pkg  = "44cfe95a-1eb2-52ea-b672-e2afdf69b78f"
+Pkg = "44cfe95a-1eb2-52ea-b672-e2afdf69b78f"
 Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"

appveyor.yml

@@ -43,7 +43,7 @@ build_script:
   - C:\projects\julia\bin\julia -e "VERSION < v\"0.7.0-DEV\" || (using InteractiveUtils);
       versioninfo();
       if VERSION < v\"0.7.0-DEV.5183\"; Pkg.clone(pwd(), \"ModuleInterfaceTools\");
-      else; using Pkg; Pkg.up(); end"
+      else; using Pkg; Pkg.add(pwd()); Pkg.up(); end"
 
 test_script:
   - C:\projects\julia\bin\julia -e "VERSION < v\"0.7.0-DEV\" || (using Pkg); Pkg.test(\"ModuleInterfaceTools\")"

src/ModuleInterfaceTools.jl

@@ -111,13 +111,16 @@ m_eval(expr) = m_eval(cur_mod(), expr)
  * develop! <names...>  # Add functions that are part of the development API (extendible)
  * modules  <names...>  # Add submodule names that are part of the API
 
+ * path     <paths...>  # Add paths to LOAD_PATH
+
  * def <name> <expr>    # Same as the @def macro, creates a macro with the given name
 
 """
 macro api(cmd::Symbol)
     mod = @static V6_COMPAT ? current_module() : @__MODULE__
     cmd == :list   ? _api_list(mod) :
     cmd == :freeze ? _api_freeze(mod) :
+    cmd == :test   ? _api_test(mod) :
     error("@api unrecognized command: $cmd")
 end
 
@@ -132,6 +135,20 @@ function _api_freeze(mod::Module)
     nothing
 end
 
+function _api_path(curmod, exprs)
+    for exp in exprs
+        if isa(exp, Expr) || isa(exp, Symbol)
+            str = m_eval(curmod, exp)
+        elseif isa(exp, String)
+            str = exp
+        else
+            error("@api path: syntax error $exp")
+        end
+        m_eval(curmod, :( push!(LOAD_PATH, $str) ))
+    end
+    nothing
+end
+
 const _cmduse = (:use, :use!, :test, :extend, :extend!, :export, :list)
 const _cmdadd =
     (:modules, :public, :develop, :public!, :develop!, :base, :base!)
@@ -276,15 +293,22 @@ function _api_list(curmod, modules)
     nothing
 end
 
+_api_test(mod) = m_eval(mod, V6_COMPAT ? :(using Base.Test) : :(using Test))
+
 function _api(curmod::Module, cmd::Symbol, exprs)
     cmd == :def && return _api_def(exprs...)
+    cmd == :path && return _api_path(curmod, exprs)
 
     ind = _ff(_cmdadd, cmd)
     ind == 0 || return _add_symbols(curmod, cmd, exprs)
 
     _ff(_cmduse, cmd) == 0 && error("Syntax error: @api $cmd $exprs")
 
     debug[] && print("_api($curmod, $cmd, $exprs)")
+
+    # Be nice and set up standard Test
+    cmd == :test && _api_test(curmod)
+
     modules = SymSet()
     for ex in exprs
         if isa(ex, Expr) && ex.head == :tuple
@@ -324,9 +348,6 @@ function _api(curmod::Module, cmd::Symbol, exprs)
         end
     end
 
-    # Be nice and set up standard Test
-    cmd == :test && m_eval(curmod, V6_COMPAT ? :(using Base.Test) : :(using Test))
-
     cpy = (cmd == :use!) || (cmd == :extend!)
 
     cpy && _init_api(curmod)

test/runtests.jl

@@ -3,9 +3,9 @@
 
 using ModuleInterfaceTools
 
-@static V6_COMPAT ? (using Base.Test) : (using Test)
+@api test
 
-push!(LOAD_PATH, @static V6_COMPAT ? joinpath(Pkg.dir(), "test") : @__DIR__)
+@api path (@static V6_COMPAT ? joinpath(Pkg.dir("ModuleInterfaceTools"), "test") : @__DIR__)
 
 @api extend APITest