Merge pull request #2309 from alco/option-parser-tests

Fix parsing of "-" in OptionParser

Author: José Valim

lib/elixir/lib/option_parser.ex

@@ -206,6 +206,14 @@ defmodule OptionParser do
     {:error, argv}
   end
 
+  defp next(["-"|_]=argv, _aliases, _switches, _strict) do
+    {:error, argv}
+  end
+
+  defp next(["- " <> _|_]=argv, _aliases, _switches, _strict) do
+    {:error, argv}
+  end
+
   defp next(["-" <> option|rest], aliases, switches, strict) do
     {option, value} = split_option(option)
     opt = tag_option(option, value, switches, aliases)
@@ -353,9 +361,11 @@ defmodule OptionParser do
     {value, kinds, t}
   end
 
-  defp value_in_tail?(["-" <> _|_]), do: false
-  defp value_in_tail?([]),           do: false
-  defp value_in_tail?(_),            do: true
+  defp value_in_tail?(["-"|_]),       do: true
+  defp value_in_tail?(["- " <> _|_]), do: true
+  defp value_in_tail?(["-" <> _|_]),  do: false
+  defp value_in_tail?([]),            do: false
+  defp value_in_tail?(_),             do: true
 
   defp split_option(option) do
     case :binary.split(option, "=") do

lib/elixir/test/elixir/option_parser_test.exs

@@ -172,6 +172,12 @@ defmodule OptionParserTest do
            == {[source: "from_docs/", docs: "show"], [], []}
   end
 
+  test "collects multiple invalid options" do
+    args = ["--bad", "opt", "foo", "-o", "bad", "bar"]
+    assert OptionParser.parse(args, switches: [bad: :integer])
+           == {[], ["foo", "bar"], [bad: "opt", o: "bad"]}
+  end
+
   test "parses more than one key/value options using strict" do
     assert OptionParser.parse(["--source", "from_docs/", "--docs", "show"],
                               strict: [source: :string, docs: :string])
@@ -180,6 +186,18 @@ defmodule OptionParserTest do
     assert OptionParser.parse(["--source", "from_docs/", "--doc", "show"],
                               strict: [source: :string, docs: :string])
            == {[source: "from_docs/"], ["show"], [doc: nil]}
+
+    assert OptionParser.parse(["--source", "from_docs/", "--doc=show"],
+                              strict: [source: :string, docs: :string])
+           == {[source: "from_docs/"], [], [doc: "show"]}
+  end
+
+  test "parses - as argument" do
+    assert OptionParser.parse(["-a", "-", "-", "-b", "-"], aliases: [b: :boo])
+           == {[boo: "-"], ["-"], [a: "-"]}
+
+    assert OptionParser.parse(["--foo", "-", "-b", "-"], strict: [foo: :boolean, boo: :string], aliases: [b: :boo])
+           == {[foo: true, boo: "-"], ["-"], []}
   end
 
   test "next strict: good options" do