Change positional auto-names to UPPER-WITH-HYPHENS

Author: xenomachina

CHANGELOG.md

@@ -14,6 +14,9 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
   previously, automatic option naming would turn "camelCase" into
   "--camelCase". Now it is converted to "--camel-case".
 
+- Likewise, positinal argument auto-naming used to convert "camelCase" into
+  "CAMELCASE". Now it is converted to "CAMEL-CASE".
+
 - Improve help formatting w/long program names
 
 ### Fixed

src/main/kotlin/ArgParser.kt

@@ -431,15 +431,19 @@ class ArgParser(args: Array<out String>,
             fun identifierToOptionName(identifier: String): String {
                 return when (identifier.length) {
                     1 -> "-" + identifier
-                    else -> "--" + identifier.replace('_', '-')
-                            .replace(Regex("(\\p{javaLowerCase})(\\p{javaUpperCase})")) { m ->
-                                m.groups[1]!!.value + "-" + m.groups[2]!!.value.toLowerCase()
-                            }
+                    else -> "--" + identifier.camelCaseToUnderscored()
                 }
             }
 
+            private fun String.camelCaseToUnderscored(): String {
+                return replace('_', '-')
+                        .replace(Regex("(\\p{javaLowerCase})(\\p{javaUpperCase})")) { m ->
+                            m.groups[1]!!.value + "-" + m.groups[2]!!.value.toLowerCase()
+                        }
+            }
+
             fun identifierToArgName(identifier: String): String {
-                return identifier.toUpperCase()
+                return identifier.camelCaseToUnderscored().toUpperCase()
             }
         }
     }

src/test/kotlin/ArgParserTest.kt

@@ -1107,7 +1107,7 @@ class ImplicitLongFlagNameTest : Test({
             flag1 shouldBe false
         }
     }.run {
-        message shouldBe "missing POSITIONALLIST_INT operand"
+        message shouldBe "missing POSITIONAL-LIST-INT operand"
     }
 })
 
@@ -1251,7 +1251,7 @@ class AutoNamedPositionalTest : Test({
     shouldThrow<MissingRequiredPositionalArgumentException> {
         Args(parserOf()).autoPositional
     }.run {
-        message shouldBe "missing AUTOPOSITIONAL operand"
+        message shouldBe "missing AUTO-POSITIONAL operand"
     }
     Args(parserOf("foo")).autoPositional shouldBe "foo"
 })
@@ -1264,7 +1264,7 @@ class AutoNamedPositionalWithTransformTest : Test({
     shouldThrow<MissingRequiredPositionalArgumentException> {
         Args(parserOf()).autoPositional
     }.run {
-        message shouldBe "missing AUTOPOSITIONAL operand"
+        message shouldBe "missing AUTO-POSITIONAL operand"
     }
     Args(parserOf("47")).autoPositional shouldBe 47
 })
@@ -1277,7 +1277,7 @@ class AutoNamedPositionalListTest : Test({
     shouldThrow<MissingRequiredPositionalArgumentException> {
         Args(parserOf()).autoPositional
     }.run {
-        message shouldBe "missing AUTOPOSITIONAL operand"
+        message shouldBe "missing AUTO-POSITIONAL operand"
     }
     Args(parserOf("foo")).autoPositional shouldBe listOf("foo")
 })
@@ -1290,7 +1290,7 @@ class AutoNamedPositionalListWithTransformTest : Test({
     shouldThrow<MissingRequiredPositionalArgumentException> {
         Args(parserOf()).autoPositional
     }.run {
-        message shouldBe "missing AUTOPOSITIONAL operand"
+        message shouldBe "missing AUTO-POSITIONAL operand"
     }
     Args(parserOf("47")).autoPositional shouldBe listOf(47)
     Args(parserOf("27", "38")).autoPositional shouldBe listOf(27, 38)