Applying Brian Egge's fix and test from CLI-122

git-svn-id: https://svn.apache.org/repos/asf/commons/proper/cli/trunk@589237 13f79535-47bb-0310-9956-ffa450edef68

Author: hen

src/java/org/apache/commons/cli2/option/ArgumentImpl.java

@@ -143,17 +143,18 @@ public void processValues(final WriteableCommandLine commandLine,
         int argumentCount = commandLine.getValues(option, Collections.EMPTY_LIST).size();
 
         while (arguments.hasNext() && (argumentCount < maximum)) {
-            final String allValues = stripBoundaryQuotes((String) arguments.next());
+            final String allValuesQuoted = (String) arguments.next();
+            final String allValues = stripBoundaryQuotes(allValuesQuoted);
 
             // should we ignore things that look like options?
-            if (allValues.equals(consumeRemaining)) {
+            if (allValuesQuoted.equals(consumeRemaining)) {
                 while (arguments.hasNext() && (argumentCount < maximum)) {
                     ++argumentCount;
                     commandLine.addValue(option, arguments.next());
                 }
             }
             // does it look like an option?
-            else if (commandLine.looksLikeOption(allValues)) {
+            else if (commandLine.looksLikeOption(allValuesQuoted)) {
                 arguments.previous();
 
                 break;

src/java/org/apache/commons/cli2/option/ParentImpl.java

@@ -217,7 +217,13 @@ private void handleInitialSeparator(final ListIterator arguments,
         if (initialIndex > 0) {
             arguments.remove();
             arguments.add(newArgument.substring(0, initialIndex));
-            arguments.add(newArgument.substring(initialIndex + 1));
+            String value = newArgument.substring(initialIndex + 1);
+            // The value obviously isn't an option, so we need to quote it if looks like an option.
+            // The quotes will be removed later
+            if (value.startsWith("-")) {
+                value = '"' + value + '"';
+            }
+            arguments.add(value);
             arguments.previous();
         }
 

src/test/org/apache/commons/cli2/bug/BugCLI122Test.java

@@ -0,0 +1,45 @@
+package org.apache.commons.cli2.bug;
+
+import junit.framework.TestCase;
+import org.apache.commons.cli2.*;
+import org.apache.commons.cli2.builder.ArgumentBuilder;
+import org.apache.commons.cli2.builder.DefaultOptionBuilder;
+import org.apache.commons.cli2.builder.GroupBuilder;
+import org.apache.commons.cli2.commandline.Parser;
+import org.apache.commons.cli2.validation.FileValidator;
+
+/**
+ * @author brianegge
+ */
+public class BugCLI122Test extends TestCase {
+    public void testArgumentWhichStartsWithDash() throws OptionException {
+        Argument wdArg = new ArgumentBuilder()
+                .withName("anything")
+                .withMaximum(1)
+                .withMinimum(1)
+                .withInitialSeparator('=')
+                .create();
+
+        Option wdOpt = new DefaultOptionBuilder().withArgument(wdArg)
+                .withDescription("anything, foo or -foo")
+                .withLongName("argument")
+                .withShortName("a")
+                .create();
+
+        Group group = new GroupBuilder().withOption(wdOpt).create();
+
+        Parser p = new Parser();
+        p.setGroup(group);
+        CommandLine normal = p.parse (new String[]{"-a", "foo"});
+        assertNotNull(normal);
+        assertEquals(normal.getValue(wdOpt), "foo");
+
+        CommandLine withDash = p.parse (new String[]{"--argument", "\"-foo\""});
+        assertNotNull(withDash);
+        assertEquals("-foo", withDash.getValue(wdOpt));
+
+        CommandLine withDashAndEquals = p.parse (new String[]{"--argument=-foo"});
+        assertNotNull(withDashAndEquals);
+        assertEquals("-foo", withDashAndEquals.getValue(wdOpt));
+    }
+}