Fix multi-line input when stdin is redirected

Fixes #32
ajalt · Nov 15, 2018 · d1bccd6 · JLLeitschuh · Nov 20, 2018 · d1bccd6
1 parent 63ff88c
commit d1bccd6
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 6 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,9 @@
 ### Added
 - `.multiple().unique()` modifier for options and arguments.
 
+### Fixed
+- Support multi-line input when redirecting stdin
+
 ## [1.5.0] - 2018-08-26
 ### Added
 - Ability to use alternate output streams rather than stdin and stdout by setting `Context.console` or by passing a console to `TermUI` functions.

diff --git a/clikt/src/main/kotlin/com/github/ajalt/clikt/core/Context.kt b/clikt/src/main/kotlin/com/github/ajalt/clikt/core/Context.kt
@@ -102,7 +102,7 @@ class Context(val parent: Context?,
          *
          * The default uses [System.in] and [System.out].
          */
-        var console: CliktConsole = defaultCliktConsole()
+        var console: CliktConsole = parent?.console ?: defaultCliktConsole()
     }
 
     companion object {

diff --git a/clikt/src/main/kotlin/com/github/ajalt/clikt/output/CliktConsole.kt b/clikt/src/main/kotlin/com/github/ajalt/clikt/output/CliktConsole.kt
@@ -56,11 +56,13 @@ class InteractiveCliktConsole(private val console: Console) : CliktConsole {
 }
 
 class NonInteractiveCliktConsole : CliktConsole {
+    private val inReader by lazy { System.`in`.bufferedReader() }
+
     override fun promptForLine(prompt: String, hideInput: Boolean) = try {
         print(prompt, false)
-        System.`in`.bufferedReader().readLine()
+        inReader.readLine() ?: throw RuntimeException("EOF")
     } catch (err: IOException) {
-        null
+        throw err
     }
 
     override fun print(text: String, error: Boolean) {

diff --git a/clikt/src/test/kotlin/com/github/ajalt/clikt/parameters/PromptOptionsTest.kt b/clikt/src/test/kotlin/com/github/ajalt/clikt/parameters/PromptOptionsTest.kt
@@ -43,16 +43,18 @@ class PromptOptionsTest {
 
     @Test
     fun `prompt option`() {
-        stdin.provideLines("bar")
+        stdin.provideLines("foo", "bar")
 
         class C : CliktCommand() {
             val foo by option().prompt()
+            val bar by option().prompt()
             override fun run() {
-                foo shouldBe "bar"
+                foo shouldBe "foo"
+                bar shouldBe "bar"
             }
         }
         C().parse(emptyArray())
-        stdout.logWithNormalizedLineSeparator shouldBe "Foo: "
+        stdout.logWithNormalizedLineSeparator shouldBe "Foo: Bar: "
     }
 
     @Test