Fix handling of boolean options with bad values

Author: alco

lib/elixir/lib/option_parser.ex

@@ -167,7 +167,7 @@ defmodule OptionParser do
 
   defp next(["-" <> option|rest], aliases, switches, strict) do
     {option, value} = split_option(option)
-    opt = tag_option(option, switches, aliases)
+    opt = tag_option(option, value, switches, aliases)
 
     if strict and not option_defined?(opt, switches) do
       {_, opt_name} = opt
@@ -236,11 +236,11 @@ defmodule OptionParser do
     end
   end
 
-  defp tag_option(<<?-, option :: binary>>, switches, _aliases) do
-    get_negated(option, switches)
+  defp tag_option(<<?-, option :: binary>>, value, switches, _aliases) do
+    get_negated(option, value, switches)
   end
 
-  defp tag_option(option, _switches, aliases) when is_binary(option) do
+  defp tag_option(option, _value, _switches, aliases) when is_binary(option) do
     opt = get_option(option)
     if alias = aliases[opt] do
       {:default, alias}
@@ -324,13 +324,17 @@ defmodule OptionParser do
     option |> to_underscore |> String.to_atom
   end
 
-  defp get_negated("no-" <> rest = option, switches) do
+  defp get_negated("no-" <> rest = option, value, switches) do
     negated = get_option(rest)
-    option  = if Keyword.has_key?(switches, negated), do: negated, else: get_option(option)
+    option  = if Keyword.has_key?(switches, negated) and value == nil do
+      negated
+    else
+      get_option(option)
+    end
     {:negated, option}
   end
 
-  defp get_negated(rest, _switches) do
+  defp get_negated(rest, _value, _switches) do
     {:default, get_option(rest)}
   end
 end

lib/elixir/test/elixir/option_parser_test.exs

@@ -67,9 +67,9 @@ defmodule OptionParserTest do
     assert OptionParser.parse(["--no-docs", "foo"], switches: [docs: :boolean])
            == {[docs: false], ["foo"], []}
     assert OptionParser.parse(["--no-docs=foo", "bar"], switches: [docs: :boolean])
-           == {[], ["bar"], [docs: "foo"]}
+           == {[], ["bar"], [no_docs: "foo"]}
     assert OptionParser.parse(["--no-docs=", "bar"], switches: [docs: :boolean])
-           == {[], ["bar"], [docs: ""]}
+           == {[], ["bar"], [no_docs: ""]}
   end
 
   test "does not set unparsed booleans" do
@@ -194,6 +194,8 @@ defmodule OptionParserTest do
            == {:error, {:undefined, :str, nil}, ["13", "..."]}
     assert OptionParser.next(["--int=hello", "..."], config)
            == {:error, {:undefined, :int, "hello"}, ["..."]}
+    assert OptionParser.next(["--no-bool=other", "..."], config)
+           == {:error, {:undefined, :no_bool, "other"}, ["..."]}
   end
 
   test "next strict: bad type" do
@@ -216,5 +218,7 @@ defmodule OptionParserTest do
            == {:error, {:value, :int, nil}, []}
     assert OptionParser.next(["--bool=", "..."], config)
            == {:error, {:value, :bool, ""}, ["..."]}
+    assert OptionParser.next(["--no-bool=", "..."], config)
+           == {:error, {:undefined, :no_bool, ""}, ["..."]}
   end
 end