Refactor and test Pkg.test

src/API.jl

@@ -22,7 +22,13 @@ function dependencies(ctx::Context)::Dict{UUID, PackageInfo}
     pkgs = Operations.load_all_deps(ctx)
     return Dict(pkg.uuid => Operations.package_info(ctx, pkg) for pkg in pkgs)
 end
-dependencies(fn::Function, uuid::UUID) = fn(dependencies()[uuid])
+function dependencies(fn::Function, uuid::UUID)
+    dep = get(dependencies(), uuid, nothing)
+    if dep === nothing
+        pkgerror("depenendency with UUID `$uuid` does not exist")
+    end
+    fn(dep)
+end
 
 project() = project(Context())
 function project(ctx::Context)::ProjectInfo

src/Types.jl

@@ -394,43 +394,6 @@ end
 
 is_stdlib(ctx::Context, uuid::UUID) = uuid in keys(ctx.stdlibs)
 
-# target === nothing : main dependencies
-# target === "*"     : main + all extras
-# target === "name"  : named target deps
-function deps_names(project::Project, target::Union{Nothing,String}=nothing)::Vector{String}
-    deps = collect(keys(project.deps))
-    if target === nothing
-        x = String[]
-    elseif target == "*"
-        x = collect(keys(project.extras))
-    else
-        x = haskey(project.targets, target) ?
-            collect(values(project.targets[target])) :
-            String[]
-    end
-    return sort!(union!(deps, x))
-end
-
-function get_deps(project::Project, target::Union{Nothing,String}=nothing)
-    names = deps_names(project, target)
-    deps = filter(((dep, _),) -> dep in names, project.deps)
-    extras = project.extras
-    for name in names
-        haskey(deps, name) && continue
-        haskey(extras, name) ||
-            pkgerror("target `$target` has unlisted dependency `$name`")
-        deps[name] = extras[name]
-    end
-    return deps
-end
-get_deps(env::EnvCache, target::Union{Nothing,String}=nothing) =
-    get_deps(env.project, target)
-
-function project_compatibility(ctx::Context, name::String)
-    compat = get(ctx.env.project.compat, name, nothing)
-    return compat === nothing ? VersionSpec() : VersionSpec(semver_spec(compat))
-end
-
 function write_env_usage(source_file::AbstractString, usage_filepath::AbstractString)
     !ispath(logdir()) && mkpath(logdir())
     usage_file = joinpath(logdir(), usage_filepath)
@@ -448,15 +411,17 @@ function write_env_usage(source_file::AbstractString, usage_filepath::AbstractSt
     close(io)
 end
 
-function read_package(f::String)
-    _throw_package_err(x) = pkgerror("expected a `$x` entry in project file at $(abspath(f))")
-
-    project = read_project(f)
-    project.name === nothing && _throw_package_err("name")
-    project.uuid === nothing && _throw_package_err("uuid")
+function read_package(path::String)
+    project = read_project(path)
+    if project.name === nothing
+        pkgerror("expected a `name` entry in project file at `$(abspath(path))`")
+    end
+    if project.uuid === nothing
+        pkgerror("expected a `uuid` entry in project file at `$(abspath(path))`")
+    end
     name = project.name
-    if !isfile(joinpath(dirname(f), "src", "$name.jl"))
-        pkgerror("expected the file `src/$name.jl` to exist for package $name at $(dirname(f))")
+    if !isfile(joinpath(dirname(path), "src", "$name.jl"))
+        pkgerror("expected the file `src/$name.jl` to exist for package `$name` at `$(dirname(path))`")
     end
     return project
 end