Merge pull request #2891 from chrismccord/master

Fix command_to_module_name not converting snakecased names properly

Signed-off-by: José Valim <[email protected]>

Author: josevalim

lib/mix/lib/mix/utils.ex

@@ -267,7 +267,7 @@ defmodule Mix.Utils do
 
   def module_name_to_command(module, nesting) do
     t = Regex.split(~r/\./, to_string(module))
-    t |> Enum.drop(nesting) |> Enum.map(&first_to_lower(&1)) |> Enum.join(".")
+    t |> Enum.drop(nesting) |> Enum.map(&underscore(&1)) |> Enum.join(".")
   end
 
   @doc """
@@ -281,16 +281,10 @@ defmodule Mix.Utils do
   """
   def command_to_module_name(s) do
     Regex.split(~r/\./, to_string(s)) |>
-      Enum.map(&first_to_upper(&1)) |>
+      Enum.map(&camelize(&1)) |>
       Enum.join(".")
   end
 
-  defp first_to_upper(<<s, t :: binary>>), do: <<to_upper_char(s)>> <> t
-  defp first_to_upper(<<>>), do: <<>>
-
-  defp first_to_lower(<<s, t :: binary>>), do: <<to_lower_char(s)>> <> t
-  defp first_to_lower(<<>>), do: <<>>
-
   defp to_upper_char(char) when char in ?a..?z, do: char - 32
   defp to_upper_char(char), do: char
 

lib/mix/test/mix/utils_test.exs

@@ -16,11 +16,15 @@ defmodule Mix.UtilsTest do
     assert Mix.Utils.module_name_to_command(Mix.Tasks.Foo, 2)       == "foo"
     assert Mix.Utils.module_name_to_command("Mix.Tasks.Foo", 2)     == "foo"
     assert Mix.Utils.module_name_to_command("Mix.Tasks.Foo.Bar", 2) == "foo.bar"
+    assert Mix.Utils.module_name_to_command("Mix.Tasks.FooBar.Bing", 2) == "foo_bar.bing"
+    assert Mix.Utils.module_name_to_command("Mix.Tasks.FooBar.BingBang", 2) == "foo_bar.bing_bang"
   end
 
   test :command_to_module_name do
     assert Mix.Utils.command_to_module_name("foo")     == "Foo"
     assert Mix.Utils.command_to_module_name("foo.bar") == "Foo.Bar"
+    assert Mix.Utils.command_to_module_name("foo_bar.baz") == "FooBar.Baz"
+    assert Mix.Utils.command_to_module_name("foo_bar.baz_bing") == "FooBar.BazBing"
   end
 
   test :underscore do