jyapayne/nimble
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix for #398 (#451)

Browse source 
* Fix for #398

* Updated fix for #398
This commit is contained in:
Ganesh Viswanathan 2018-01-15 05:17:40 -06:00 • committed by Dominik Picheta
commit 5dc0404dee
1 changed files with 15 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

38
src/nimblepkg/publish.nim
View file

@ -11,8 +11,7 @@ import tools, common, cli, config, options
type
Auth = object
user: string
pw: string
token: string ## base64 encoding of user:pw
token: string ## Github access token
http: HttpClient ## http client for doing API requests
const
@ -50,8 +49,9 @@ proc requestNewToken(cfg: Config): string =
sleep(3000)
return token
proc getGithubAuth(cfg: Config): Auth =
result.http = newHttpClient()
proc getGithubAuth(o: Options): Auth =
let cfg = o.config
result.http = newHttpClient(proxy = getProxy(o))
# always prefer the environment variable to asking for a new one
if existsEnv(ApiTokenEnvironmentVariable):
result.token = getEnv(ApiTokenEnvironmentVariable)
@ -150,21 +150,9 @@ proc editJson(p: PackageInfo; url, tags, downloadMethod: string) =
})
writeFile("packages.json", contents.pretty.cleanupWhitespace)
proc getPackageOriginUrl(a: Auth): string =
## Adds 'user:pw' to the URL so that the user is not asked *again* for it.
## We need this for 'git push'.
let (output, exitCode) = doCmdEx("git ls-remote --get-url")
result = "origin"
if exitCode == 0:
result = output.string.strip
if result.endsWith(".git"): result.setLen(result.len - 4)
if result.startsWith("https://"):
result = "https://" & a.user & ':' & a.pw & '@' &
result["https://".len .. ^1]
proc publish*(p: PackageInfo, o: Options) =
## Publishes the package p.
let auth = getGithubAuth(o.config)
let auth = getGithubAuth(o)
var pkgsDir = getTempDir() / "nimble-packages-fork"
if not forkExists(auth):
createFork(auth)
@ -177,13 +165,17 @@ proc publish*(p: PackageInfo, o: Options) =
display("Removing", "old packages fork git directory.",
priority = LowPriority)
removeDir(pkgsDir)
display("Cloning", "packages into: " & pkgsDir, priority = HighPriority)
doCmd("git clone git@github.com:" & auth.user & "/packages " & pkgsDir)
# Make sure to update the clone.
display("Updating", "the fork", priority = HighPriority)
createDir(pkgsDir)
cd pkgsDir:
# Avoid git clone to prevent token from being stored in repo
# https://github.com/blog/1270-easier-builds-and-deployments-using-git-over-https-and-oauth
display("Copying", "packages fork into: " & pkgsDir, priority = HighPriority)
doCmd("git init")
doCmd("git pull https://github.com/" & auth.user & "/packages")
# Make sure to update the fork
display("Updating", "the fork", priority = HighPriority)
doCmd("git pull https://github.com/nim-lang/packages.git master")
doCmd("git push origin master")
doCmd("git push https://" & auth.token & "@github.com/" & auth.user & "/packages master")
if not dirExists(pkgsDir):
raise newException(NimbleError,
@ -227,6 +219,6 @@ proc publish*(p: PackageInfo, o: Options) =
doCmd("git checkout -B " & branchName)
doCmd("git commit packages.json -m \"Added package " & p.name & "\"")
display("Pushing", "to remote of fork.", priority = HighPriority)
doCmd("git push " & getPackageOriginUrl(auth) & " " & branchName)
doCmd("git push https://" & auth.token & "@github.com/" & auth.user & "/packages " & branchName)
createPullRequest(auth, p.name, branchName)
display("Success:", "Pull request successful.", Success, HighPriority)