Add Mix.Config.persist/1

Author: José Valim

lib/mix/lib/mix/cli.ex

@@ -104,7 +104,7 @@ defmodule Mix.CLI do
     if File.regular?(path) do
       path
       |> Mix.Config.read()
-      |> Mix.Tasks.Loadconfig.set()
+      |> Mix.Config.persist()
     end
   end
 

lib/mix/lib/mix/config.ex

@@ -15,6 +15,17 @@ defmodule Mix.Config do
     config
   end
 
+  @doc """
+  Persists the given configuration by modifying
+  the configured applications environment.
+  """
+  def persist(config) do
+    for {app, kw} <- config, {k, v} <- kw do
+      :application.set_env(app, k, v, persist: true)
+    end
+    :ok
+  end
+
   @doc """
   Validates a configuration.
   """

lib/mix/lib/mix/tasks/compile.elixir.ex

@@ -271,10 +271,10 @@ defmodule Mix.Tasks.Compile.Elixir do
   @doc """
   Compiles stale Elixir files.
 
-  It expects a manifest file, all stale files, all source files
-  available (including the ones that are not stale) and a path
-  where compiled files will be written to. All paths are required
-  to be relative to the current working directory.
+  It expects a manifest file, a flag if compilation should be forced
+  or not, all source files available (including the ones that are not
+  stale) and a path where compiled files will be written to. All paths
+  are required to be relative to the current working directory.
 
   The manifest is written down with information including dependencies
   in between modules, which helps it recompile only the modules that

lib/mix/lib/mix/tasks/compile.ex

@@ -50,9 +50,6 @@ defmodule Mix.Tasks.Compile do
     shell.info "\nEnabled compilers: #{Enum.join get_compilers, ", "}"
   end
 
-  @doc """
-  Runs this compile task by recursively calling all registered compilers.
-  """
   def run(args) do
     # --no-deps is used only internally. It has not purpose
     # from Mix.CLI because the CLI itself already loads

lib/mix/lib/mix/tasks/loadconfig.ex

@@ -2,18 +2,24 @@ defmodule Mix.Tasks.Loadconfig do
   use Mix.Task
 
   @moduledoc """
-  Loads the application configuration.
+  Loads and persists the project configuration.
 
   In case the application is an umbrella application, the
   configuration for all children app will be merged together
   and, in case there are any conflicts, they need to be resolved
   in the umbrella application.
   """
 
+  @doc """
+  Runs this task.
+  """
   def run(_) do
-    set load()
+    Mix.Config.persist load()
   end
 
+  @doc """
+  Loads the configuration for the current project.
+  """
   def load() do
     if Mix.Project.get do
       project = Mix.Project.config
@@ -25,13 +31,6 @@ defmodule Mix.Tasks.Loadconfig do
     end
   end
 
-  def set(config) do
-    _ =
-      for {app, kw} <- config, {k, v} <- kw do
-        :application.set_env(app, k, v, persist: true)
-      end
-  end
-
   defp eval(nil) do
     if File.regular?("config/config.exs") do
       eval("config/config.exs")

lib/mix/lib/mix/tasks/local.rebar.ex

@@ -8,11 +8,11 @@ defmodule Mix.Tasks.Local.Rebar do
 
   @moduledoc """
   Fetch a copy of rebar from the given path or url. It defaults to a
-  rebar copy that ships with Elixir source if available or fetches it from
-  #{@rebar_url}.
-The local copy is stored in your MIX_HOME (defaults to ~/.mix).
+  rebar copy that ships with Elixir source if available or fetches it
+  from #{@rebar_url}.
 
-  This version of rebar will be used as required by mix deps.compile
+  The local copy is stored in your MIX_HOME (defaults to ~/.mix).
+  This version of rebar will be used as required by `mix deps.compile`.
   """
 
   def run(argv) do

lib/mix/test/mix/config_test.exs

@@ -19,4 +19,12 @@ defmodule Mix.ConfigTest do
       Mix.Config.read fixture_path("configs/bad_root.exs")
     end
   end
+
+  test "persist/1" do
+    assert Application.get_env(:my_app, :key) == nil
+    Mix.Config.persist [my_app: [key: :value]]
+    assert Application.get_env(:my_app, :key) == :value
+  after
+    Application.delete_env(:my_app, :key)
+  end
 end