Merge pull request #70 from fingolfin/mh/reduce-diffs-release-1.1

Reduce diffs to other branches for release-1.1

src/TestEnv.jl

@@ -11,4 +11,4 @@ include("common.jl")
 include("activate_do.jl")
 include("activate_set.jl")
 
-end
+end

src/activate_do.jl

@@ -22,4 +22,4 @@ function activate(f, pkg::AbstractString=current_pkg_name())
             Pkg.activate(ctx.env.project_file)
         end
     end
-end
+end

src/common.jl

@@ -15,7 +15,7 @@ end
 
 """
    ctx, pkgspec = ctx_and_pkgspec(pkg::AbstractString)
-   
+
 For a given package name `pkg`, instantiate a `Context` for it, and return that `Context`,
 and it's `PackageSpec`.
 """
@@ -47,14 +47,17 @@ function isinstalled!(ctx::Context, pkgspec::Pkg.Types.PackageSpec)
     return true
 end
 
+
 function test_dir_has_project_file(ctx, pkgspec)
-    return isfile(joinpath(get_test_dir(ctx, pkgspec), "Project.toml"))
+    test_dir = get_test_dir(ctx, pkgspec)
+    test_dir === nothing && return false
+    return isfile(joinpath(test_dir, "Project.toml"))
 end
 
 """
     get_test_dir(ctx::Context, pkgspec::Pkg.Types.PackageSpec)
 
-Gets the testfile path of the package. Code for each Julia version mirrors that found 
+Gets the testfile path of the package. Code for each Julia version mirrors that found
 in `Pkg/src/Operations.jl`.
 """
 function get_test_dir(ctx::Context, pkgspec::Pkg.Types.PackageSpec)
@@ -74,4 +77,4 @@ function get_test_dir(ctx::Context, pkgspec::Pkg.Types.PackageSpec)
             throw(TestEnvError("Could not find either `git-tree-sha1` or `path` for package $(pkgspec.name)"))
         end
     end
-end
+end