Factor shellwords out to separate class, ref cucumber#597

Author: aslakhellesoy

core/src/main/java/cucumber/runtime/RuntimeOptions.java

@@ -17,7 +17,6 @@
 import java.util.ArrayList;
 import java.util.List;
 import java.util.ResourceBundle;
-import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
 import static cucumber.runtime.model.CucumberFeature.load;
@@ -26,7 +25,6 @@
 public class RuntimeOptions {
     public static final String VERSION = ResourceBundle.getBundle("cucumber.version").getString("cucumber-jvm.version");
     public static final String USAGE = FixJava.readResource("/cucumber/runtime/USAGE.txt");
-    private static final Pattern SHELLWORDS_PATTERN = Pattern.compile("[^\\s']+|'([^']*)'");
 
     private final List<String> glue = new ArrayList<String>();
     private final List<Object> filters = new ArrayList<Object>();
@@ -48,7 +46,7 @@ public class RuntimeOptions {
      * @param argv the arguments
      */
     public RuntimeOptions(String argv) {
-        this(new FormatterFactory(), shellWords(argv));
+        this(new FormatterFactory(), Shellwords.parse(argv));
     }
 
     /**
@@ -78,7 +76,7 @@ public RuntimeOptions(Env env, FormatterFactory formatterFactory, List<String> a
 
         String cucumberOptionsFromEnv = env.get("cucumber.options");
         if (cucumberOptionsFromEnv != null) {
-            parse(shellWords(cucumberOptionsFromEnv));
+            parse(Shellwords.parse(cucumberOptionsFromEnv));
         }
         filters.addAll(lineFilters);
 
@@ -88,19 +86,6 @@ public RuntimeOptions(Env env, FormatterFactory formatterFactory, List<String> a
         setFormatterOptions();
     }
 
-    private static List<String> shellWords(String cmdline) {
-        List<String> matchList = new ArrayList<String>();
-        Matcher shellwordsMatcher = SHELLWORDS_PATTERN.matcher(cmdline);
-        while (shellwordsMatcher.find()) {
-            if (shellwordsMatcher.group(1) != null) {
-                matchList.add(shellwordsMatcher.group(1));
-            } else {
-                matchList.add(shellwordsMatcher.group());
-            }
-        }
-        return matchList;
-    }
-
     private void parse(List<String> args) {
         List<Object> parsedFilters = new ArrayList<Object>();
         List<Object> parsedLineFilters = new ArrayList<Object>();

core/src/main/java/cucumber/runtime/Shellwords.java

@@ -0,0 +1,23 @@
+package cucumber.runtime;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+public class Shellwords {
+    private static final Pattern SHELLWORDS_PATTERN = Pattern.compile("[^\\s']+|'([^']*)'");
+
+    public static List<String> parse(String cmdline) {
+        List<String> matchList = new ArrayList<String>();
+        Matcher shellwordsMatcher = SHELLWORDS_PATTERN.matcher(cmdline);
+        while (shellwordsMatcher.find()) {
+            if (shellwordsMatcher.group(1) != null) {
+                matchList.add(shellwordsMatcher.group(1));
+            } else {
+                matchList.add(shellwordsMatcher.group());
+            }
+        }
+        return matchList;
+    }
+}

core/src/test/java/cucumber/runtime/ShellwordsTest.java

@@ -0,0 +1,26 @@
+package cucumber.runtime;
+
+import org.junit.Ignore;
+import org.junit.Test;
+
+import static java.util.Arrays.asList;
+import static org.junit.Assert.assertEquals;
+
+public class ShellwordsTest {
+    @Test
+    public void parses_single_quoted_strings() {
+        assertEquals(asList("--name", "The Fox"), Shellwords.parse("--name 'The Fox'"));
+    }
+
+    @Ignore("TODO: fixme")
+    @Test
+    public void parses_double_quoted_strings() {
+        assertEquals(asList("--name", "The Fox"), Shellwords.parse("--name \"The Fox\""));
+    }
+
+    @Ignore("TODO: fixme")
+    @Test
+    public void parses_both_single_and_double_quoted_strings() {
+        assertEquals(asList("--name", "The Fox", "--fur", "Brown White"), Shellwords.parse("--name \"The Fox\" --fur 'Brown White'"));
+    }
+}