Add more coveralls settings

Author: stringbean

build.sbt

@@ -1,7 +1,7 @@
 name := "sbt-jacoco"
 organization := "com.github.sbt"
 
-version in ThisBuild := "3.1.0-M1"
+version in ThisBuild := "3.1.0-M2"
 
 sbtPlugin := true
 crossSbtVersions := Seq("0.13.16", "1.0.2")

src/main/scala/com/github/sbt/jacoco/coveralls/CoverallsReportFormat.scala

@@ -6,12 +6,27 @@ import com.github.sbt.jacoco.report.formats.JacocoReportFormat
 import org.jacoco.report.IReportVisitor
 import sbt._
 
-class CoverallsReportFormat(sourceDirs: Seq[File], projectRootDir: File, jobId: String, repoToken: Option[String])
+class CoverallsReportFormat(
+    sourceDirs: Seq[File],
+    projectRootDir: File,
+    serviceName: String,
+    jobId: Option[String],
+    buildNumber: Option[String],
+    pullRequest: Option[String],
+    repoToken: Option[String])
     extends JacocoReportFormat {
 
   override def createVisitor(directory: File, encoding: String): IReportVisitor = {
     IO.createDirectory(directory)
 
-    new CoverallsReportVisitor(directory / "coveralls.json", sourceDirs, projectRootDir, jobId, repoToken)
+    new CoverallsReportVisitor(
+      directory / "coveralls.json",
+      sourceDirs,
+      projectRootDir,
+      serviceName,
+      jobId,
+      buildNumber,
+      pullRequest,
+      repoToken)
   }
 }

src/main/scala/com/github/sbt/jacoco/coveralls/CoverallsReportVisitor.scala

@@ -16,7 +16,10 @@ class CoverallsReportVisitor(
     output: File,
     sourceDirs: Seq[File],
     projectRootDir: File,
-    jobId: String,
+    serviceName: String,
+    jobId: Option[String],
+    buildNumber: Option[String],
+    pullRequest: Option[String],
     repoToken: Option[String])
     extends IReportVisitor
     with IReportGroupVisitor {
@@ -32,8 +35,16 @@ class CoverallsReportVisitor(
     json.writeStringField("repo_token", token)
   }
 
-  json.writeStringField("service_job_id", jobId)
-  json.writeStringField("service_name", "travis-ci")
+  json.writeStringField("service_name", serviceName)
+  jobId foreach { id =>
+    json.writeStringField("service_job_id", id)
+  }
+  pullRequest foreach { pr =>
+    json.writeStringField("service_pull_request", pr)
+  }
+  buildNumber foreach { build =>
+    json.writeStringField("service_number", build)
+  }
 
   json.writeArrayFieldStart("source_files")
 

src/main/scala/com/github/sbt/jacoco/coveralls/JacocoCoverallsPlugin.scala

@@ -14,13 +14,15 @@ object JacocoCoverallsPlugin extends BaseJacocoPlugin {
   override protected def srcConfig = Test
 
   object autoImport {
-    val jacocoCoveralls: TaskKey[Unit] = taskKey("Upload JaCoCo reports to Coveralls")
+    val jacocoCoveralls: TaskKey[Unit] = taskKey("Generate and upload JaCoCo reports to Coveralls")
+    val jacocoCoverallsGenerateReport: TaskKey[Unit] = taskKey("Generate Coveralls report JSON")
 
-    val jacocoCoverallsJobId: SettingKey[String] = settingKey("todo")
-    val jacocoCoverallsGenerateReport: TaskKey[Unit] = taskKey("TODO")
+    val jacocoCoverallsServiceName: SettingKey[String] = settingKey("CI service name")
+    val jacocoCoverallsBuildNumber: SettingKey[Option[String]] = settingKey("Build number to send to Coveralls")
+    val jacocoCoverallsJobId: SettingKey[Option[String]] = settingKey("Build job ID to send to Coveralls")
+    val jacocoCoverallsPullRequest: SettingKey[Option[String]] = settingKey("Pull request number to send to Coveralls")
     val jacocoCoverallsOutput: SettingKey[File] = settingKey("File to store Coveralls coverage")
-
-    val jacocoCoverallsRepoToken: SettingKey[Option[String]] = settingKey("todo")
+    val jacocoCoverallsRepoToken: SettingKey[Option[String]] = settingKey("Coveralls repo secret key")
   }
 
   import autoImport._ // scalastyle:ignore import.grouping
@@ -35,7 +37,10 @@ object JacocoCoverallsPlugin extends BaseJacocoPlugin {
         new CoverallsReportFormat(
           coveredSources.value,
           baseDirectory.value,
+          jacocoCoverallsServiceName.value,
           jacocoCoverallsJobId.value,
+          jacocoCoverallsBuildNumber.value,
+          jacocoCoverallsPullRequest.value,
           jacocoCoverallsRepoToken.value)
 
       ReportUtils.generateReport(
@@ -52,7 +57,16 @@ object JacocoCoverallsPlugin extends BaseJacocoPlugin {
     jacocoCoveralls := (jacocoCoveralls dependsOn jacocoCoverallsGenerateReport).value,
     // TODO fail if no job id
     // TODO manual job id
-    jacocoCoverallsJobId := sys.env.getOrElse("TRAVIS_JOB_ID", "unknown"),
+    jacocoCoverallsServiceName := "travis-ci",
+    jacocoCoverallsJobId := sys.env.get("TRAVIS_JOB_ID"),
+    jacocoCoverallsBuildNumber := sys.env.get("TRAVIS_JOB_NUMBER"),
+    jacocoCoverallsPullRequest := {
+      sys.env.get("TRAVIS_PULL_REQUEST") match {
+        case Some("false") => None
+        case Some(pr) => Some(pr)
+        case _ => None
+      }
+    },
     jacocoCoverallsRepoToken := None
   )
 }