diff options
author | Daniel Spiewak <djspiewak@gmail.com> | 2018-08-14 18:20:26 -0600 |
---|---|---|
committer | Jakob Odersky <jakob@odersky.com> | 2018-08-14 18:20:26 -0600 |
commit | becc47cb5ecfec59d828a041a188624a03b8b88f (patch) | |
tree | 66b4911dcef2b76ee3a62e3c8163a62eda545eb8 /src/main/scala/Gpg.scala | |
parent | b8a11f179e5771f026231f7bb95637d7950bc73f (diff) | |
download | sbt-gpg-becc47cb5ecfec59d828a041a188624a03b8b88f.tar.gz sbt-gpg-becc47cb5ecfec59d828a041a188624a03b8b88f.tar.bz2 sbt-gpg-becc47cb5ecfec59d828a041a188624a03b8b88f.zip |
Added gpgWarnOnFailure (#6)
* Added gpgWarnOnFailure key (name subject to bikeshedding) and associated semantics
* Added stderr redirect to gpg command
* Corrected test to use `publish / packagedArtifacts`
* Updated README for new fail-on-failure default for publish (and tweaked a couple other things)
Diffstat (limited to 'src/main/scala/Gpg.scala')
-rw-r--r-- | src/main/scala/Gpg.scala | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/src/main/scala/Gpg.scala b/src/main/scala/Gpg.scala index cde4dba..edd1935 100644 --- a/src/main/scala/Gpg.scala +++ b/src/main/scala/Gpg.scala @@ -5,19 +5,22 @@ import java.io.File import scala.util.control.NonFatal import sys.process._ -class Gpg( - command: String, - options: Seq[String] = Seq.empty, - keyId: Option[String] = None)(log: String => Unit = System.err.println) { +class Gpg(command: String, + options: Seq[String] = Seq.empty, + keyId: Option[String] = None)( + info: String => Unit = System.out.println, + warn: String => Unit = System.err.println) { + + private val logger = ProcessLogger(info, info) // gpg uses stderr for everything; redirect to info def run(params: String*): Int = try { val idOption = keyId.toSeq.flatMap(id => Seq("--local-user", id)) - val process = Process(command, options ++ idOption ++ params).run() + val process = Process(command, options ++ idOption ++ params).run(logger) process.exitValue() } catch { case NonFatal(ex) => - log(ex.getMessage) + warn(ex.getMessage) 127 } |