Merge pull request #11 from strykeforce/feature/9-menu-quit

Make quitting require 'Q' to prevent accidents

Author: jhh

src/main/kotlin/org/strykeforce/thirdcoast/Readers.kt

@@ -80,9 +80,9 @@ fun LineReader.readMenu(size: Int, prompt: String, default: String = "", quit: B
             else -> INVALID
         }
     } catch (nfe: NumberFormatException) {
-        when (line.toLowerCase()) {
-            "b" -> BACK
-            "q" -> if (quit) QUIT else INVALID
+        when (line) {
+            "b", "B" -> BACK
+            "Q" -> if (quit) QUIT else INVALID
             else -> INVALID
         }
     }
@@ -108,7 +108,7 @@ fun Terminal.readRawMenu(size: Int, prompt: String, quit: Boolean = false): Int
     this.writer().println()
     return when (char) {
         'b', 'B', '\r' -> BACK
-        'q', 'Q' -> if (quit) QUIT else INVALID
+        'Q' -> if (quit) QUIT else INVALID
         else -> validMenuChoices.indexOf(char) // -1 == INVALID
     }
 }

src/main/kotlin/org/strykeforce/thirdcoast/command/MenuCommand.kt

@@ -38,7 +38,7 @@ class MenuCommand(
         }
         if (parent != null)
             writer.println("back to previous menu".toMenu("b"))
-        writer.println("quit TCT".toMenu("q"))
+        writer.println("quit TCT".toMenu("Q"))
 
     }
 

src/test/kotlin/org/strykeforce/thirdcoast/ReadersTest.kt

@@ -168,7 +168,7 @@ internal class ReadersTest {
 
         @Test
         fun `gets quit`() {
-            whenever(reader.readLine(any(), isNull(), any())).thenReturn("q")
+            whenever(reader.readLine(any(), isNull(), any())).thenReturn("Q")
             assertThat(reader.readMenu(menu)).isEqualTo(QUIT)
         }