Reorder args in option method, rem auto-naming

Author: xenomachina

src/main/kotlin/ArgParser.kt

@@ -214,11 +214,11 @@ class ArgParser(args: Array<out String>,
      * @param handler a function that computes the value of this option from an [OptionInvocation]
      */
     fun <T> option(
-            // TODO: fix ordering: help goes first
             // TODO: add optionalArg: Boolean
             vararg names: String,
-            errorName: String,
             help: String,
+            // TODO: make errorName nullable, and choose name from option names if null
+            errorName: String,
             argNames: List<String> = emptyList(),
             isRepeating: Boolean = false,
             handler: OptionInvocation<T>.() -> T
@@ -234,31 +234,6 @@ class ArgParser(args: Array<out String>,
         return delegate
     }
 
-    /**
-     * Creates a DelegateProvider for an option
-     * @param errorName name to use when talking about this option in error messages
-     * @param help the help text for this option
-     * @param argNames names of this option's arguments
-     * @param isRepeating whether or not it make sense to repeat this option -- usually used for options where
-     * specifying the option more than once yields a value than cannot be expressed by specifying the option only once
-     * @param handler a function that computes the value of this option from an [OptionInvocation]
-     */
-    fun <T> option(
-            // TODO: fix ordering: help goes first
-            // TODO: add optionalArg: Boolean
-            errorName: String,
-            help: String,
-            argNames: List<String> = emptyList(),
-            isRepeating: Boolean = false,
-            handler: OptionInvocation<T>.() -> T
-    ) = DelegateProvider { name ->
-        option(identifierToOptionName(name),
-                errorName = errorName,
-                help = help,
-                argNames = argNames,
-                isRepeating = isRepeating,
-                handler = handler) }
-
     /**
      * Creates a Delegate for a single positional argument which returns the argument's value.
      */
@@ -806,7 +781,6 @@ private const val ARG_INITIAL_CHAR_CLASS = "[A-Z]"
 private const val ARG_CHAR_CLASS = "[A-Z0-9]"
 private val ARG_NAME_RE = Regex("^$ARG_INITIAL_CHAR_CLASS+([-_]$ARG_CHAR_CLASS+)*$")
 
-
 fun <T> ArgParser.DelegateProvider<T>.default(newDefault: T): ArgParser.DelegateProvider<T> {
     return ArgParser.DelegateProvider(ctor = ctor, defaultHolder = Holder(newDefault))
 }

src/test/kotlin/ArgParserTest.kt

@@ -16,8 +16,20 @@
 // You should have received a copy of the GNU Lesser General Public License
 // along with this library; if not, see http://www.gnu.org/licenses/
 
-package com.xenomachina.argparser
-
+package com.xenomachina.argparser.tests
+
+import com.xenomachina.argparser.ArgParser
+import com.xenomachina.argparser.DefaultHelpFormatter
+import com.xenomachina.argparser.HelpFormatter
+import com.xenomachina.argparser.InvalidArgumentException
+import com.xenomachina.argparser.MissingRequiredPositionalArgumentException
+import com.xenomachina.argparser.MissingValueException
+import com.xenomachina.argparser.OptionMissingRequiredArgumentException
+import com.xenomachina.argparser.ShowHelpException
+import com.xenomachina.argparser.UnexpectedOptionArgumentException
+import com.xenomachina.argparser.UnexpectedPositionalArgumentException
+import com.xenomachina.argparser.UnrecognizedOptionException
+import com.xenomachina.argparser.default
 import com.xenomachina.common.orElse
 import io.kotlintest.matchers.Matcher
 import io.kotlintest.matchers.Result
@@ -1241,6 +1253,7 @@ class PositionalListDefaultTest : Test({
 class AutoNamedLongOptionWithMultipleArgsTest : Test({
     class Args(parser: ArgParser) {
         val xyz by parser.option<MutableList<String>>(
+                "--xyz",
                 errorName = "XYZ",
                 argNames = listOf("COLOR", "SIZE", "FLAVOR"),
                 help = TEST_HELP) {