Support --config on mix run

Author: José Valim

lib/elixir/lib/kernel/cli.ex

@@ -323,9 +323,7 @@ defmodule Kernel.CLI do
   end
 
   defp process_command({:require, pattern}, _config) when is_binary(pattern) do
-    files = Path.wildcard(pattern)
-    files = Enum.uniq(files)
-    files = Enum.filter files, &:filelib.is_regular(&1)
+    files = filter_patterns(pattern)
 
     if files != [] do
       wrapper fn -> Enum.map files, &Code.require_file(&1) end
@@ -335,9 +333,7 @@ defmodule Kernel.CLI do
   end
 
   defp process_command({:parallel_require, pattern}, _config) when is_binary(pattern) do
-    files = Path.wildcard(pattern)
-    files = Enum.uniq(files)
-    files = Enum.filter files, &:filelib.is_regular(&1)
+    files = filter_patterns(pattern)
 
     if files != [] do
       wrapper fn -> Kernel.ParallelRequire.files(files) end
@@ -349,7 +345,7 @@ defmodule Kernel.CLI do
   defp process_command({:compile, patterns}, config) do
     :filelib.ensure_dir(:filename.join(config.output, "."))
 
-    case match_regular_files(patterns) do
+    case filter_multiple_patterns(patterns) do
       {:ok, []} ->
         {:error, "No files matched provided patterns"}
       {:ok, files} ->
@@ -363,9 +359,13 @@ defmodule Kernel.CLI do
     end
   end
 
-  defp match_regular_files(patterns) do
+  defp filter_patterns(pattern) do
+    Enum.filter(Enum.uniq(Path.wildcard(pattern)), &:filelib.is_regular(&1))
+  end
+
+  defp filter_multiple_patterns(patterns) do
     matched_files = Enum.map patterns, fn(pattern) ->
-      case Path.wildcard(pattern) do
+      case filter_patterns(pattern) do
         []    -> {:missing, pattern}
         files -> {:ok, files}
       end
@@ -380,9 +380,7 @@ defmodule Kernel.CLI do
        &elem(&1, 1)
 
     if missing_patterns == [] do
-      files = Enum.uniq(Enum.concat(files))
-      files = Enum.filter files, &:filelib.is_regular(&1)
-      {:ok, files}
+      {:ok, Enum.uniq(Enum.concat(files))}
     else
       {:missing,  Enum.uniq(missing_patterns)}
     end

lib/elixir/test/elixir/gen_server_test.exs

@@ -26,6 +26,17 @@ defmodule GenServerTest do
     def handle_cast(request, state) do
       super(request, state)
     end
+
+    def terminate(_reason, _state) do
+      # There is a race condition if the agent is
+      # restarted too fast and it is registered.
+      try do
+        self |> Process.info(:registered_name) |> elem(1) |> Process.unregister
+      rescue
+        _ -> :ok
+      end
+      :ok
+    end
   end
 
   test "start_link/2, call/2 and cast/2" do

lib/mix/lib/mix/tasks/run.ex

@@ -22,6 +22,7 @@ defmodule Mix.Tasks.Run do
 
   ## Command line options
 
+  * `--config`, `-c` - loads the given configuration file
   * `--eval`, `-e` - evaluate the given code
   * `--require`, `-r` - require pattern before running the command
   * `--parallel-require`, `-pr` - requires pattern in parallel
@@ -33,8 +34,8 @@ defmodule Mix.Tasks.Run do
   """
   def run(args) do
     {opts, head, _} = OptionParser.parse_head(args,
-      aliases: [r: :require, pr: :parallel_require, e: :eval],
-      switches: [parallel_require: :keep, require: :keep, eval: :keep])
+      aliases: [r: :require, pr: :parallel_require, e: :eval, c: :config],
+      switches: [parallel_require: :keep, require: :keep, eval: :keep, config: :keep])
 
     # Require the project to be available
     Mix.Project.get!
@@ -47,37 +48,12 @@ defmodule Mix.Tasks.Run do
       end
 
     System.argv(argv)
+    process_config opts
 
     # Start app after rewriting System.argv,
     # but before requiring and evaling
     Mix.Task.run "app.start", args
-
-    Enum.each opts, fn({key, value}) ->
-      case key do
-        :parallel_require ->
-          case filter_patterns(value) do
-            [] ->
-              Mix.raise "No files matched pattern #{inspect value} given to --parallel-require"
-
-            filtered ->
-              Kernel.ParallelRequire.files(filtered)
-          end
-
-        :require ->
-          case filter_patterns(value) do
-            [] ->
-              Mix.raise "No files matched pattern #{inspect value} given to --require"
-
-            filtered ->
-              Enum.each(filtered, &Code.require_file(&1))
-          end
-
-        :eval ->
-          Code.eval_string(value)
-        _ ->
-          :ok
-      end
-    end
+    process_load opts
 
     if file do
       if File.regular?(file) do
@@ -89,7 +65,39 @@ defmodule Mix.Tasks.Run do
     if opts[:no_halt], do: :timer.sleep(:infinity)
   end
 
+  defp process_config(opts) do
+    Enum.each opts, fn
+      {:config, value} ->
+        Mix.Task.run "loadconfig", [value]
+      _ ->
+        :ok
+    end
+  end
+
+  defp process_load(opts) do
+    Enum.each opts, fn
+      {:parallel_require, value} ->
+        case filter_patterns(value) do
+          [] ->
+            Mix.raise "No files matched pattern #{inspect value} given to --parallel-require"
+          filtered ->
+            Kernel.ParallelRequire.files(filtered)
+        end
+      {:require, value} ->
+        case filter_patterns(value) do
+          [] ->
+            Mix.raise "No files matched pattern #{inspect value} given to --require"
+          filtered ->
+            Enum.each(filtered, &Code.require_file(&1))
+        end
+      {:eval, value} ->
+        Code.eval_string(value)
+      _ ->
+        :ok
+    end
+  end
+
   defp filter_patterns(pattern) do
-    Enum.filter(Enum.uniq(Path.wildcard(pattern)), &File.regular?(&1))
+    Enum.filter(Enum.uniq(Path.wildcard(pattern)), &:filelib.is_regular(&1))
   end
 end

lib/mix/lib/mix/tasks/test.ex

@@ -82,9 +82,13 @@ defmodule Mix.Tasks.Test do
 
       mix test --include external --exclude test
 
-  When filtering tests by line number the following styles are equivalent:
+  In case a single file is being tested, it is possible pass a specific
+  line number:
 
       mix test test/some/particular/file_test.exs:12
+
+  Which is equivalent to:
+
       mix test --only line:12 test/some/particular/file_test.exs
 
   ## Configuration

lib/mix/test/mix/tasks/run_test.exs

@@ -3,6 +3,8 @@ Code.require_file "../../test_helper.exs", __DIR__
 defmodule Mix.Tasks.RunTest do
   use MixTest.Case
 
+  import ExUnit.CaptureIO
+
   defmodule GetApp do
     def project do
       [ app: :get_app,
@@ -17,6 +19,18 @@ defmodule Mix.Tasks.RunTest do
     Mix.Project.push MixTest.Case.Sample
   end
 
+  test "loads configuration" do
+    in_fixture "no_mixfile", fn ->
+      assert capture_io(fn ->
+        Mix.Task.run "run",
+          ["--config", fixture_path("configs/good_config.exs"),
+           "--eval", "IO.puts Application.get_env(:my_app, :key)"]
+      end) == "value\n"
+    end
+  after
+    Application.delete_env(:my_app, :key)
+  end
+
   test "run requires files before evaling commands" do
     git_repo = fixture_path("git_repo/lib/git_repo.ex")