Updates to travis, build both 0.7 and nightly

Author: ScottPJones

.travis.yml

@@ -5,6 +5,7 @@ os:
   - osx
 julia:
   - 0.6
+  - 0.7
   - nightly
 notifications:
   email: false
@@ -27,7 +28,7 @@ git:
 
 ## uncomment the following lines to override the default test script
 script:
-  - julia -e 'mit="ModuleInterfaceTools"; if VERSION < v"0.7.0-DEV.5183"; Pkg.clone(pwd()); Pkg.test(mit; coverage=true); else; import Pkg; using UUIDs; p = "Project.toml"; uuid = "5cb8414e-7aab-5a03-a681-351269c074bf"; write(p, replace(read(p, String), uuid => uuid4())); Pkg.up(); Pkg.test(;coverage=true); end'
+  - julia -e 'mit="ModuleInterfaceTools"; if VERSION < v"0.7.0-DEV.5183"; Pkg.clone(pwd()); Pkg.test(mit; coverage=true); else; import Pkg; using UUIDs; p = "Project.toml"; uuid = "5cb8414e-7aab-5a03-a681-351269c074bf"; write(p, replace(read(p, String), uuid => uuid4())); Pkg.update(); end; Pkg.test(;coverage=true)'
 after_success:
   # push coverage results to Coveralls
   - julia -e 'cd(Pkg.dir("ModuleInterfaceTools")); Pkg.add("Coverage"); using Coverage; Coveralls.submit(Coveralls.process_folder())'

Manifest.toml

@@ -1,17 +1,179 @@
+[[Base64]]
+uuid = "2a0f44e3-6c83-55bd-87e4-b1978d98bd5f"
+
+[[BinDeps]]
+deps = ["Compat", "Libdl", "SHA", "URIParser"]
+git-tree-sha1 = "160d5d926e83e0970dd549ad9fe0ac3e8107e83c"
+uuid = "9e28174c-4ba2-5203-b857-d8d62c4213ee"
+version = "0.8.8"
+
+[[BufferedStreams]]
+deps = ["Compat", "Pkg", "Test"]
+git-tree-sha1 = "260922227fa4affdce57c59063fabf33a324d50e"
+uuid = "e1450e63-4bb3-523b-b2a4-4ffa8c0fd77d"
+version = "0.4.0"
+
+[[Compat]]
+deps = ["Base64", "Dates", "DelimitedFiles", "Distributed", "InteractiveUtils", "LibGit2", "Libdl", "LinearAlgebra", "Markdown", "Mmap", "Pkg", "Printf", "REPL", "Random", "Serialization", "SharedArrays", "Sockets", "SparseArrays", "Test", "UUIDs", "Unicode"]
+git-tree-sha1 = "f3e87ca1e2df8e1e4f82ea504fddf0b9b0894f61"
+uuid = "34da2185-b29b-5c13-b0c7-acf172513d20"
+version = "0.69.0"
+
 [[Dates]]
 uuid = "ade2ca70-3891-5945-98fb-dc099432e06a"
 
+[[DelimitedFiles]]
+uuid = "8bb1440f-4735-579b-a4ab-409b98df4dab"
+
+[[Distributed]]
+uuid = "8ba89e20-285c-5b6f-9357-94700520ee1b"
+
+[[Emoji_Entities]]
+deps = ["InteractiveUtils", "JSON", "Pkg", "StrTables", "Test"]
+git-tree-sha1 = "c0f35d6b5e351fdb2358dc25187d9aff82b24c15"
+uuid = "fd8f23de-bd2f-5c75-921c-0c9ab51355f5"
+version = "0.2.4"
+
+[[Format]]
+deps = ["Compat", "InteractiveUtils"]
+git-tree-sha1 = "9ad515cebcfc4bb4b04ae41dc5f2cbe857300623"
+uuid = "1fa38f19-a742-5d3f-a2b9-30dd87b9d5f8"
+version = "0.6.4"
+
+[[HTML_Entities]]
+deps = ["InteractiveUtils", "Pkg", "StrTables", "Test"]
+git-tree-sha1 = "d0076ca9d51e7d6ff4c1d65e7e83239d0262e4c1"
+uuid = "7693890a-d069-55fe-a829-b4a6d304f0ee"
+version = "0.2.4"
+
+[[HTTPClient]]
+deps = ["Compat", "LibCURL"]
+git-tree-sha1 = "161d5776ae8e585ac0b8c20fb81f17ab755b3671"
+uuid = "0862f596-cf2d-50af-8ef4-f2be67dfa83f"
+version = "0.2.1"
+
 [[InteractiveUtils]]
 uuid = "b77e0a4c-d291-57a0-90e8-8db25a27a240"
 
+[[JSON]]
+deps = ["Compat", "Nullables", "Sockets", "Unicode"]
+git-tree-sha1 = "e2f6776e8bfd310b2ade13fba1faf99d8967d58f"
+uuid = "682c06a0-de6a-54ab-a142-c8b1cf79cde6"
+version = "0.17.2"
+
+[[LaTeX_Entities]]
+deps = ["InteractiveUtils", "LightXML", "Pkg", "StrTables", "Test"]
+git-tree-sha1 = "e78a8240b2c8e0c9e8de3f64a379e811a519901d"
+uuid = "9927f19a-46ce-5bdd-a20a-f46a78b61e3d"
+version = "0.2.4"
+
+[[LibCURL]]
+deps = ["BinDeps", "Compat", "Libdl", "WinRPM"]
+git-tree-sha1 = "9b431bc66757ad5124f4d206c319996a2dfa2662"
+uuid = "b27032c2-a3e7-50c8-80cd-2d36dbcbfd21"
+version = "0.2.2"
+
+[[LibExpat]]
+deps = ["Compat"]
+git-tree-sha1 = "8ba2ca1635ec1755bcf1432c9a2aa6c91a3fb4fd"
+uuid = "522f3ed2-3f36-55e3-b6df-e94fee9b0c07"
+version = "0.4.2"
+
+[[LibGit2]]
+uuid = "76f85450-5226-5b5a-8eaa-529ad045b433"
+
+[[Libdl]]
+uuid = "8f399da3-3557-5675-b5ff-fb832c97cbdb"
+
+[[Libz]]
+deps = ["BufferedStreams", "Compat"]
+git-tree-sha1 = "501a8a5b0c500c3a04adb65a3468e3de5ad4e0d9"
+uuid = "2ec943e9-cfe8-584d-b93d-64dcb6d567b7"
+version = "0.2.4"
+
+[[LightXML]]
+deps = ["Compat", "WinRPM"]
+git-tree-sha1 = "06ff5861b4e8f2f510c29687fa753a8bbef8a2cd"
+uuid = "9c8b4983-aa76-5018-a973-4c85ecc9e179"
+version = "0.6.0"
+
+[[LinearAlgebra]]
+uuid = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"
+
+[[Markdown]]
+uuid = "d6f4376e-aef5-505a-96c1-9c027394607a"
+
+[[Mmap]]
+uuid = "a63ad114-7e13-5084-954f-fe012c677804"
+
+[[Nullables]]
+deps = ["Compat"]
+git-tree-sha1 = "23258f849603ad4fed3ce7dbcb8c0658920fa5ef"
+uuid = "4d1e1d77-625e-5b40-9113-a560ec7a8ecd"
+version = "0.0.5"
+
 [[Pkg]]
 uuid = "44cfe95a-1eb2-52ea-b672-e2afdf69b78f"
 
+[[Printf]]
+uuid = "de0858da-6303-5e67-8744-51eddeeeb8d7"
+
+[[REPL]]
+uuid = "3fa0cd96-eef1-5676-8a61-b3b8758bbffb"
+
+[[Random]]
+uuid = "9a3f8284-a2c9-5f02-9a11-845980a1fd5c"
+
+[[SHA]]
+uuid = "ea8e919c-243c-51af-8825-aaa63cd721ce"
+
+[[Serialization]]
+uuid = "9e88b42a-f829-5b0c-bbe9-9e923198166b"
+
+[[SharedArrays]]
+uuid = "1a1011a3-84de-559e-8e89-a11a2f7dc383"
+
+[[Sockets]]
+uuid = "6462fe0b-24de-5631-8697-dd941f90decc"
+
+[[SparseArrays]]
+uuid = "2f01184e-e22b-5df5-ae63-d93ebab69eaf"
+
 [[StrTables]]
 deps = ["Dates", "InteractiveUtils", "Pkg", "Test"]
 git-tree-sha1 = "56e259bdbcf08215f567771c765b8d93b6bbdf42"
 uuid = "9700d1a9-a7c8-5760-9816-a99fda30bb8f"
 version = "0.2.4"
 
+[[StringLiterals]]
+deps = ["Emoji_Entities", "Format", "HTML_Entities", "LaTeX_Entities", "StrTables", "Test", "Unicode_Entities"]
+git-tree-sha1 = "dfc1c5b232b26692ad0dddf32f1e7402360acfd5"
+uuid = "8f8e9dd7-1da5-502a-9ec1-434721d5fc53"
+version = "0.3.0"
+
 [[Test]]
 uuid = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
+
+[[URIParser]]
+deps = ["Compat", "Unicode"]
+git-tree-sha1 = "0f9c5e2d14e03fbd00696f9394e288bdd5adacbc"
+uuid = "30578b45-9adc-5946-b283-645ec420af67"
+version = "0.3.1"
+
+[[UUIDs]]
+uuid = "cf7118a7-6976-5b1a-9a39-7adc72f591a4"
+
+[[Unicode]]
+uuid = "4ec0a83e-493e-50e2-b9ac-8f72acf5a8f5"
+
+[[Unicode_Entities]]
+deps = ["InteractiveUtils", "Pkg", "StrTables", "Test", "Unicode"]
+git-tree-sha1 = "d08e288e668c6ef96eeb10ebaf58e5544e6a78b4"
+uuid = "a8aa15d3-c567-5e9f-b6cc-4b0f97f09cf7"
+version = "0.2.4"
+
+[[WinRPM]]
+deps = ["BinDeps", "Compat", "HTTPClient", "LibExpat", "Libdl", "Libz", "SHA", "URIParser"]
+git-tree-sha1 = "43730fcfe2f4921e7cfe1c21a6fdfeabb7ee4d74"
+uuid = "c17dfb99-b4f7-5aad-8812-456da1ad7187"
+version = "0.3.2"

Project.toml

@@ -4,9 +4,11 @@ keywords = ["Packages", "API", "Modules"]
 license = "MIT"
 desc = "Macro to help manage module and package APIs"
 authors = ["ScottPJones <[email protected]>"]
-version = "0.1.4"
+version = "0.1.5"
 
 [deps]
+Format = "1fa38f19-a742-5d3f-a2b9-30dd87b9d5f8"
 Pkg = "44cfe95a-1eb2-52ea-b672-e2afdf69b78f"
 StrTables = "9700d1a9-a7c8-5760-9816-a99fda30bb8f"
+StringLiterals = "8f8e9dd7-1da5-502a-9ec1-434721d5fc53"
 Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"

appveyor.yml

@@ -2,6 +2,8 @@ environment:
   matrix:
   - JULIA_URL: "https://julialang-s3.julialang.org/bin/winnt/x86/0.6/julia-0.6-latest-win32.exe"
   - JULIA_URL: "https://julialang-s3.julialang.org/bin/winnt/x64/0.6/julia-0.6-latest-win64.exe"
+  - JULIA_URL: "https://julialang-s3.julialang.org/bin/winnt/x86/0.6/julia-0.7-latest-win32.exe"
+  - JULIA_URL: "https://julialang-s3.julialang.org/bin/winnt/x64/0.6/julia-0.7-latest-win64.exe"
   - JULIA_URL: "https://julialangnightlies-s3.julialang.org/bin/winnt/x86/julia-latest-win32.exe"
   - JULIA_URL: "https://julialangnightlies-s3.julialang.org/bin/winnt/x64/julia-latest-win64.exe"
 
@@ -37,12 +39,12 @@ install:
 # Run installer silently, output to C:\projects\julia
   - C:\projects\julia-binary.exe /S /D=C:\projects\julia
 
-build_script:
 # Need to convert from shallow to complete for Pkg.clone to work
+build_script:
   - IF EXIST .git\shallow (git fetch --unshallow)
   - C:\projects\julia\bin\julia -e "VERSION < v\"0.7.0-DEV\" || (using InteractiveUtils, Pkg);
       versioninfo(); mit = \"ModuleInterfaceTools\";
-      if VERSION < v\"0.7.0-DEV.5183\"; Pkg.clone(pwd(), mit); else; Pkg.up(); end"
+      if VERSION < v\"0.7.0-DEV.5183\"; Pkg.clone(pwd(), mit); else; pkg\"up\"; end"
 
 test_script:
   - C:\projects\julia\bin\julia -e "VERSION < v\"0.7.0-DEV\" || (using Pkg); push!(LOAD_PATH, \"test\"); Pkg.test(\"ModuleInterfaceTools\")"

src/ModuleInterfaceTools.jl

@@ -114,6 +114,8 @@ end
  * public!  <names...>  # Add functions that are part of the public API (extendible)
  * develop  <names...>  # Add other symbols that are part of the development API
  * develop! <names...>  # Add functions that are part of the development API (extendible)
+ * define!  <names...>  # Define functions to be extended, public API
+ * defdev!  <names...>  # Define functions to be extended, develop API
  * modules  <names...>  # Add submodule names that are part of the API
 
  * path     <paths...>  # Add paths to LOAD_PATH
@@ -183,13 +185,15 @@ function _add_def!(curmod, grp, exp)
     else
         error("@api $grp: syntax error $exp")
     end
-    if isdefined(Base, sym)
+    if grp == :base! && isdefined(Base, sym)
         m_eval(curmod, :(import Base.$sym ))
         m_eval(curmod, :(push!(__tmp_api__.base, $(QuoteNode(sym)))))
-    else
-        m_eval(curmod, :(function $sym end))
-        m_eval(curmod, :(push!(__tmp_api__.public!, $(QuoteNode(sym)))))
+        return
     end
+    m_eval(curmod, :(function $sym end))
+    m_eval(curmod, (grp == :defdev!
+                    ? :(push!(__tmp_api__.develop!, $(QuoteNode(sym))))
+                    : :(push!(__tmp_api__.public!,  $(QuoteNode(sym))))))
 end
 
 function push_args!(symbols, lst, grp)
@@ -220,7 +224,7 @@ function _add_symbols(curmod, grp, exprs)
         println()
     end
     _init_api(curmod)
-    if grp == :base!
+    if grp == :base! || grp == :define! || grp == :defdev!
         for ex in exprs
             if isa(ex, Expr) && ex.head == :tuple
                 for sym in ex.args