fixed GitHub saved token retrieval & PkgError visibility

JuliaLang · May 19, 2015 · 6d32dd3 · 6d32dd3
1 parent 09707b5
commit 6d32dd3
Show file tree

Hide file tree

Showing 8 changed files with 15 additions and 11 deletions.
diff --git a/base/pkg.jl b/base/pkg.jl
@@ -10,6 +10,10 @@ export dir, init, rm, add, available, installed, status, clone, checkout,
 const DEFAULT_META = "https://github.com/JuliaLang/METADATA.jl"
 const META_BRANCH = "metadata-v2"
 
+type PkgError <: Exception
+    msg::AbstractString
+end
+
 for file in split("git libgit2 dir github types reqs cache read query resolve write generate entry")
     include("pkg/$file.jl")
 end

diff --git a/base/pkg/cache.jl b/base/pkg/cache.jl
@@ -2,7 +2,7 @@
 
 module Cache
 
-import ..LibGit2, ..Dir
+import ..LibGit2, ..Dir, Pkg.PkgError
 using ..Types
 
 path(pkg::AbstractString) = abspath(".cache", pkg)

diff --git a/base/pkg/dir.jl b/base/pkg/dir.jl
@@ -2,7 +2,7 @@
 
 module Dir
 
-import ..Pkg: DEFAULT_META, META_BRANCH
+import ..Pkg: DEFAULT_META, META_BRANCH, PkgError
 import ..LibGit2, ..LibGit2.with
 
 const DIR_NAME = ".julia"

diff --git a/base/pkg/github.jl b/base/pkg/github.jl
@@ -2,7 +2,7 @@
 
 module GitHub
 
-import Main, ..LibGit2, ..Dir
+import Main, ..LibGit2, ..Dir, ...Pkg.PkgError
 
 const AUTH_NOTE = "Julia Package Manager"
 const AUTH_DATA = Dict{Any,Any}(
@@ -64,7 +64,10 @@ end
 
 function token(user::AbstractString=user())
     tokfile = Dir.path(".github","token")
-    isfile(tokfile) && return strip(readchomp(tokfile))
+    if isfile(tokfile)
+        tok = strip(readchomp(tokfile))
+        !isempty(tok) && return tok
+    end
     status, header, content = curl("https://api.github.com/authorizations",AUTH_DATA,`-u $user`)
     tfa = false
 

diff --git a/base/pkg/query.jl b/base/pkg/query.jl
@@ -2,7 +2,7 @@
 
 module Query
 
-import ...Pkg
+import ...Pkg.PkgError
 using ..Types
 
 function requirements(reqs::Dict, fix::Dict, avail::Dict)

diff --git a/base/pkg/read.jl b/base/pkg/read.jl
@@ -2,7 +2,7 @@
 
 module Read
 
-import ..LibGit2, ..Cache, ..Reqs
+import ..LibGit2, ..Cache, ..Reqs, ...Pkg.PkgError
 using ..Types
 
 readstrip(path...) = strip(readall(joinpath(path...)))

diff --git a/base/pkg/reqs.jl b/base/pkg/reqs.jl
@@ -2,6 +2,7 @@
 
 module Reqs
 
+import Pkg.PkgError
 using ..Types
 
 # representing lines of REQUIRE files

diff --git a/base/pkg/types.jl b/base/pkg/types.jl
@@ -88,8 +88,4 @@ show(io::IO, f::Fixed) = isempty(f.requires) ?
 # Free could include the same information too, it just isn't
 # required by anything that processes these things.
 
-type PkgError <: Exception
-    msg::AbstractString
-end
-
-end # module
+end # module