Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix cd path when registering a new package (fix #43) #58

Merged
merged 8 commits into from
Aug 3, 2016
Merged
Show file tree
Hide file tree
Changes from 7 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/entry.jl
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ function write_tag_metadata(repo::GitRepo, pkg::AbstractString, ver::VersionNumb
LibGit2.cat(pkg_repo, LibGit2.GitBlob, "$commit:REQUIRE")
end
reqs = content !== nothing ? Reqs.read(split(content, '\n', keep=false)) : Reqs.Line[]
cd("METADATA") do
cd(Pkg.dir("METADATA")) do
d = joinpath(pkg,"versions",string(ver))
mkpath(d)
sha1file = joinpath(d,"sha1")
Expand Down
14 changes: 14 additions & 0 deletions test/runtests.jl
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ end

temp_pkg_dir() do pkgdir

#=
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

to be removed before merging, yeah?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sure.

@testset "testing a package with test dependencies causes them to be installed for the duration of the test" begin
PkgDev.generate("PackageWithTestDependencies", "MIT", config=Dict("user.name"=>"Julia Test", "user.email"=>"test@julialang.org"))
@test [keys(Pkg.installed())...] == ["PackageWithTestDependencies"]
Expand Down Expand Up @@ -158,6 +159,19 @@ end"""
f = PkgDev.freeable(io)
@test any(f .== "Example") || contains(takebuf_string(io), "Example")
end
=#

@testset "testing package registration" begin
if haskey(ENV, "CI") && lowercase(ENV["CI"]) == "true"
info("setting git global configuration")
run(`git config --global user.name "Julia Test"`)
run(`git config --global user.email test@julialang.org`)
run(`git config --global github.user JuliaTest`)
Copy link
Contributor

@tkelman tkelman Aug 3, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

maybe a better approach would be to create a temporary directory, and do withenv("HOME" => ...) ?

edit: or set HOME to be inside of JULIA_PKGDIR? is there a different git-specific config location environment variable we could use?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Running git config --local ... inside a package repository may be better than modifying global configurations.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LibGit2.config?

end
PkgDev.generate("GreatNewPackage", "MIT")
PkgDev.register("GreatNewPackage")
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think this will need git credentials of some kind

@test !isempty(readstring(joinpath(pkgdir, "METADATA", "GreatNewPackage", "url")))
end
end

@testset "Testing package utils" begin
Expand Down