Merge pull request #212 from JuliaPOMDP/0.6-better_add

adding appears to work; added some adds to Travis

Author: zsunberg

.travis.yml

@@ -12,6 +12,8 @@ before_script:
 script:
   - if [[ -a .git/shallow ]]; then git fetch --unshallow; fi
   - julia --check-bounds=yes -e 'Pkg.clone(pwd())'
+  - julia --check-bounds=yes -e 'using POMDPs; POMDPs.add("QMDP")'
+  - julia --check-bounds=yes -e 'using POMDPs; POMDPs.add("BasicPOMCP")'
   - julia --check-bounds=yes -e 'Pkg.test("POMDPs")'
 after_success:
   - julia -e 'Pkg.add("Documenter")'

src/utils.jl

@@ -12,13 +12,17 @@ julia> POMDPs.add("MCTS")
 """
 function add(solver_name::AbstractString, v::Bool=true)
     @assert solver_name in SUPPORTED_PACKAGES string("The JuliaPOMDP package: ", solver_name, " is not supported")
-    full_url = string(REMOTE_URL, solver_name, ".jl")
     if solver_name in REGISTERED_PACKAGES
         Pkg.add(solver_name)
     else
         try
-            Pkg.clone(full_url)
-            Pkg.checkout(solver_name, BRANCH06)
+            Pkg.cd(clone_without_resolving, solver_name)
+            try
+                Pkg.checkout(solver_name, BRANCH06)
+            catch
+                warn("could not checkout 0.6-version of $solver_name")
+            end
+            Pkg.resolve()
             Pkg.build(solver_name)
         catch ex
             if isa(ex, Base.Pkg.PkgError) && ex.msg == "$solver_name already exists"
@@ -123,6 +127,23 @@ function available()
     end
 end
 
+
+function clone_without_resolving(pkg::AbstractString)
+    # copied from Pkg.clone
+    url = string(REMOTE_URL, pkg, ".jl")
+    info("Cloning $pkg from $url")
+    ispath(pkg) && throw(Pkg.PkgError("$pkg already exists"))
+    try
+        Base.LibGit2.with(Base.LibGit2.clone(url, pkg)) do repo
+            Base.LibGit2.set_remote_url(repo, url)
+        end
+    catch err
+        isdir(pkg) && Base.rm(pkg, recursive=true)
+        rethrow(err)
+    end
+end
+
+
 # This does not appear to work
 #=
 """