Bring the multiple .iex.exs functionality

Author: José Valim

CHANGELOG.md

@@ -41,7 +41,6 @@
   * [String] Deprecate `:global` option in `String.split/3` in favor of `parts: :infinity`
 
 * Backwards incompatible changes
-  * [IEx] IEx no longer loads an `.iex.exs` file at the current path. Instead, IEx should be configured via the new Mix config
   * [ExUnit] `ExUnit.Test` and `ExUnit.TestCase` has been converted to structs
   * [ExUnit] The test and callback context has been converted to maps
   * [Kernel] `File.Stat`, `HashDict`, `HashSet`, `Inspect.Opts`, `Macro.Env`, `Range`, `Regex` and `Version.Requirement` have been converted to structs. This means `is_record/2` checks will no longer work, instead, you can pattern match on them using `%Range{}` and similar

bin/iex

@@ -18,7 +18,7 @@ if [ $# -gt 0 ] && ([ "$1" = "--help" ] || [ "$1" = "-h" ]); then
   --detached        Starts the Erlang VM detached from console
   --gen-debug       Turns on default debugging for all GenServers
   --remsh \"name\"    Connects to a node using a remote shell
-  --dot-iex \"path\"  Overrides default ~/.iex.exs file and uses path instead;
+  --dot-iex \"path\"  Overrides default .iex.exs file and uses path instead;
                     path can be empty, then no file will be loaded
 
 ** Options marked with (*) can be given more than once

lib/iex/lib/iex.ex

@@ -120,15 +120,16 @@ defmodule IEx do
   Connecting an Elixir shell to a remote node without Elixir is
   **not** supported.
 
-  ## The ~/.iex.exs file
+  ## The .iex.exs file
 
-  When starting IEx, it will look for a global configuration file
-  (located at `~/.iex.exs`) and load it if available. The code in the
-  chosen .iex file will be evaluated in the shell's context. So, for
-  instance, any modules that are loaded or variables that are bound
-  in the .iex file will be available in the shell after it has booted.
+  When starting IEx, it will look for a local `.iex.exs` file (located in the current
+  working directory), then a global one (located at `~/.iex.exs`) and will load the
+  first one it finds (if any). The code in the chosen .iex file will be
+  evaluated in the shell's context. So, for instance, any modules that are
+  loaded or variables that are bound in the .iex file will be available in the
+  shell after it has booted.
 
-  Sample contents of a .iex file:
+  Sample contents of a local .iex file:
 
       # source another `.iex` file
       import_file "~/.iex.exs"
@@ -140,7 +141,7 @@ defmodule IEx do
       value = 13
 
   Running the shell in the directory where the above .iex file is located
-  results in
+  results in:
 
       $ iex
       Erlang 17 [...]

lib/iex/lib/iex/evaluator.ex

@@ -39,12 +39,18 @@ defmodule IEx.Evaluator do
   Returns the new config.
   """
   def load_dot_iex(config, path \\ nil) do
-    path = path || "~/.iex.exs"
-
-    if File.regular?(path) do
-      eval_dot_iex(config, path)
+    candidates = if path do
+      [path]
     else
+      Enum.map [".iex.exs", "~/.iex.exs"], &Path.expand/1
+    end
+
+    path = Enum.find candidates, &File.regular?/1
+
+    if nil?(path) do
       config
+    else
+      eval_dot_iex(config, path)
     end
   end