Nemcio/GitBucket
1
0
Fork 0
mirror of https://github.com/gitbucket/gitbucket.git synced 2025-11-05 04:56:02 +01:00
Code Issues Packages Projects Releases Wiki Activity

(refs #74)Add "Test Hook" button.

Browse Source
This commit is contained in:
takezoe
2013-09-18 20:10:53 +09:00
parent aa8da1b046
commit d8698d02b7
4 changed files with 106 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
src/main/scala/app/RepositorySettingsController.scala
View File

@@ -2,10 +2,15 @@ package app
import service._
import util.Directory._
import util.{UsersAuthenticator, OwnerAuthenticator}
import util.{JGitUtil, UsersAuthenticator, OwnerAuthenticator}
import jp.sf.amateras.scalatra.forms._
import org.apache.commons.io.FileUtils
import org.scalatra.FlashMapSupport
import service.WebHookService.{WebHookRepository, WebHookUser, WebHookCommit, WebHookPayload}
import org.eclipse.jgit.diff.DiffEntry
import scala.collection.mutable.ListBuffer
import org.eclipse.jgit.revwalk.RevCommit
import util.JGitUtil.CommitInfo
class RepositorySettingsController extends RepositorySettingsControllerBase
with RepositoryService with AccountService with WebHookService
@@ -103,7 +108,7 @@ trait RepositorySettingsControllerBase extends ControllerBase with FlashMapSuppo
* Display the web hook page.
*/
get("/:owner/:repository/settings/hooks")(ownerOnly { repository =>
settings.html.hooks(getWebHookURLs(repository.owner, repository.name), repository)
settings.html.hooks(getWebHookURLs(repository.owner, repository.name), repository, flash.get("info"))
})
/**
@@ -123,6 +128,42 @@ trait RepositorySettingsControllerBase extends ControllerBase with FlashMapSuppo
redirect(s"/${repository.owner}/${repository.name}/settings/hooks")
})
/**
* Send the test request to registered web hook URLs.
*/
get("/:owner/:repository/settings/hooks/test")(ownerOnly { repository =>
JGitUtil.withGit(getRepositoryDir(repository.owner, repository.name)){ git =>
// TODO Retrieve only specified branch logs.
val i = git.log.setMaxCount(3).call.iterator
// TODO Don't use ListBuffer!!!!
val list = new ListBuffer[CommitInfo]()
while(i.hasNext){
val commit = i.next
list.append(new CommitInfo(commit))
}
val payload = new WebHookPayload(
git,
"refs/heads/" + repository.repository.defaultBranch,
repository,
list.toList,
getAccountByUserName(repository.owner).get)
callWebHook(repository.owner, repository.name, payload)
flash += "info" -> "Test payload deployed!"
}
redirect(s"/${repository.owner}/${repository.name}/settings/hooks")
})
get("/xxx/xxx/xxx/webhooktest"){
println(params("payload"))
}
post("/xxx/xxx/xxx/webhooktest"){
println(params("payload"))
}
/**
* Display the delete repository page.
*/