Improve epilogue formatting

Also refactor DelegateProviderTest slightly.

Author: xenomachina

src/main/kotlin/ArgParser.kt

@@ -934,10 +934,10 @@ class DefaultHelpFormatter(
         appendSection(sb, usageColumns, columns, "optional", optional)
         appendSection(sb, usageColumns, columns, "positional", positional)
 
-        if (!epilogue.isNullOrEmpty()) {
+        if (!epilogue?.trim().isNullOrEmpty()) {
             sb.append("\n")
             // we just checked that epilogue is non-null
-            sb.append(epilogue!!.wrapText(columns))
+            sb.append(epilogue!!.trim().wrapText(columns))
             sb.append("\n")
         }
 

src/test/kotlin/ArgParserTest.kt

@@ -361,14 +361,18 @@ class LongOptionsWithMultipleArgsTest : Test({
 })
 
 class DelegateProviderTest : Test({
-    fun ArgParser.putting(help: String): ArgParser.DelegateProvider<Map<String, String>> =
-            ArgParser.DelegateProvider { identifier ->
-                option<MutableMap<String, String>>(identifierToOptionName(identifier),
-                        argNames = listOf("KEY", "VALUE"),
-                        help = help) {
-                    value.orElse { mutableMapOf<String, String>() }.apply { put(arguments.first(), arguments.last()) }
-                }
+    fun ArgParser.putting(vararg names: String, help: String) =
+            option<MutableMap<String, String>>(*names,
+                    argNames = listOf("KEY", "VALUE"),
+                    help = help) {
+                value.orElse { mutableMapOf<String, String>() }.apply {
+                    put(arguments.first(), arguments.last()) }
             }
+
+    fun ArgParser.putting(help: String) =
+            ArgParser.DelegateProvider { identifier ->
+                putting(identifierToOptionName(identifier), help = help) }
+
     class Args(parser: ArgParser) {
         val dict by parser.putting(TEST_HELP)
     }
@@ -1018,12 +1022,11 @@ positional arguments:
   DEST                destination file
 
 
-
-This is the epilogue. Lorem ipsum dolor sit amet, consectetur
-adipiscing elit. Donec vel tortor nunc. Sed eu massa sed
-turpis auctor faucibus. Donec vel pellentesque tortor. Ut
-ultrices tempus lectus fermentum vestibulum. Phasellus.
-
+This is the epilogue. Lorem ipsum dolor sit amet,
+consectetur adipiscing elit. Donec vel tortor nunc. Sed eu
+massa sed turpis auctor faucibus. Donec vel pellentesque
+tortor. Ut ultrices tempus lectus fermentum vestibulum.
+Phasellus.
 """.trimStart()
     }
 })