Normalize IEx and ExUnit configurations

Author: José Valim

CHANGELOG.md

@@ -33,13 +33,15 @@
   * [Process] `Process.spawn/1`, `Process.spawn/3`, `Process.spawn_link/1`, `Process.spawn_link/3`, `Process.spawn_monitor/1`, `Process.spawn_monitor/3`, `Process.send/2` and `Process.self/0` are deprecated in favor of the ones in `Kernel`
 
 * Deprecations
+  * [IEx] IEx.Options is deprecated in favor of `IEx.configure/1` and `IEx.configuration/0`
   * [Kernel] `lc` and `bc` comprehensions are deprecated in favor of `for`
   * [Macro] `Macro.safe_terms/1` is deprecated
   * [Process] `Process.delete/0` is deprecated
   * [Regex] Deprecate `:global` option in `Regex.split/3` in favor of `parts: :infinity`
   * [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/elixir/lib/application.ex

@@ -111,6 +111,14 @@ defmodule Application do
   @type value :: term
   @type start_type :: :permanent | :transient | :temporary
 
+  @doc """
+  Returns all key-value pairs for `app`.
+  """
+  @spec get_all_env(app) :: [{key,value}]
+  def get_all_env(app) do
+    :application.get_all_env(app)
+  end
+
   @doc """
   Returns the value for `key` in `app`'s environment.
 

lib/elixir/lib/io/ansi.ex

@@ -7,8 +7,8 @@ defmodule IO.ANSI.Sequence do
         "\e[#{unquote(code)}#{unquote(terminator)}"
       end
 
-      defp escape_sequence(<< unquote(atom_to_binary(name)), rest :: binary >>) do
-        {"\e[#{unquote(code)}#{unquote(terminator)}", rest}
+      defp escape_sequence(unquote(atom_to_list(name))) do
+        unquote(name)()
       end
     end
   end
@@ -130,15 +130,8 @@ defmodule IO.ANSI do
   @doc "Clear screen"
   defsequence :clear, "2", "J"
 
-
-  # Catch spaces between codes
-  defp escape_sequence(<< ?\s, rest :: binary >>) do
-    escape_sequence(rest)
-  end
-
   defp escape_sequence(other) do
-    [spec|_] = String.split(other, ~r/(,|\})/)
-    raise ArgumentError, message: "invalid ANSI sequence specification: #{spec}"
+    raise ArgumentError, message: "invalid ANSI sequence specification: #{other}"
   end
 
   @doc ~S"""
@@ -163,8 +156,8 @@ defmodule IO.ANSI do
   """
   @spec escape(String.t, emit :: boolean) :: String.t
   def escape(string, emit \\ terminal?) do
-    {rendered, emitted} = do_escape(string, false, emit, false, [])
-    if emitted and emit do
+    {rendered, emitted} = do_escape(string, emit, false, nil, [])
+    if emitted do
       rendered <> reset
     else
       rendered
@@ -193,34 +186,43 @@ defmodule IO.ANSI do
   """
   @spec escape_fragment(String.t, emit :: boolean) :: String.t
   def escape_fragment(string, emit \\ terminal?) do
-    {rendered, _emitted} = do_escape(string, false, emit, false, [])
-    rendered
+    {escaped, _emitted} = do_escape(string, emit, false, nil, [])
+    escaped
   end
 
-  defp do_escape(<< ?%, ?{, rest :: binary >>, false, emit, _emitted, acc) do
-    do_escape_sequence(rest, emit, acc)
-  end
-  defp do_escape(<< ?,, rest :: binary >>, true, emit, _emitted, acc) do
-    do_escape_sequence(rest, emit, acc)
+  defp do_escape(<<?}, t :: binary>>, emit, emitted, buffer, acc) when is_list(buffer) do
+    sequences =
+      buffer
+      |> Enum.reverse()
+      |> :string.tokens(',')
+      |> Enum.map(&(&1 |> :string.strip |> escape_sequence))
+      |> Enum.reverse()
+
+    if emit and sequences != [] do
+      do_escape(t, emit, true, nil, sequences ++ acc)
+    else
+      do_escape(t, emit, emitted, nil, acc)
+    end
   end
-  defp do_escape(<< ?\s, rest :: binary >>, true, emit, emitted, acc) do
-    do_escape(rest, true, emit, emitted, acc)
+
+  defp do_escape(<<h, t :: binary>>, emit, emitted, buffer, acc) when is_list(buffer) do
+    do_escape(t, emit, emitted, [h|buffer], acc)
   end
-  defp do_escape(<< ?}, rest :: binary >>, true, emit, emitted, acc) do
-    do_escape(rest, false, emit, emitted, acc)
+
+  defp do_escape(<<>>, _emit, _emitted, buffer, _acc) when is_list(buffer) do
+    buffer = iodata_to_binary Enum.reverse(buffer)
+    raise ArgumentError, message: "missing } for escape fragment #{buffer}"
   end
-  defp do_escape(<< x :: [binary, size(1)], rest :: binary>>, false, emit, emitted, acc) do
-    do_escape(rest, false, emit, emitted, [x|acc])
+
+  defp do_escape(<<?%, ?{, t :: binary>>, emit, emitted, nil, acc) do
+    do_escape(t, emit, emitted, [], acc)
   end
-  defp do_escape("", false, _emit, emitted, acc) do
-    {iodata_to_binary(Enum.reverse(acc)), emitted}
+
+  defp do_escape(<<h, t :: binary>>, emit, emitted, nil, acc) do
+    do_escape(t, emit, emitted, nil, [h|acc])
   end
 
-  defp do_escape_sequence(rest, emit, acc) do
-    {code, rest} = escape_sequence(rest)
-    if emit do
-      acc = [code|acc]
-    end
-    do_escape(rest, true, emit, true, acc)
+  defp do_escape(<<>>, _emit, emitted, nil, acc) do
+    {iodata_to_binary(Enum.reverse(acc)), emitted}
   end
 end

lib/elixir/test/elixir/application_test.exs

@@ -11,6 +11,7 @@ defmodule ApplicationTest do
     assert Application.put_env(:elixir, :unknown, :known) == :ok
     assert Application.fetch_env(:elixir, :unknown) == {:ok, :known}
     assert Application.get_env(:elixir, :unknown, :default) == :known
+    assert {:unknown, :known} in Application.get_all_env(:elixir)
 
     assert Application.delete_env(:elixir, :unknown) == :ok
     assert Application.get_env(:elixir, :unknown, :default) == :default

lib/elixir/test/elixir/io/ansi_test.exs

@@ -27,6 +27,9 @@ defmodule IO.ANSITest do
   end
 
   test :no_emit do
+    assert IO.ANSI.escape("Hello, %{}world!", false) ==
+           "Hello, world!"
+
     assert IO.ANSI.escape("Hello, %{red,bright}world!", false) ==
            "Hello, world!"
   end

lib/ex_unit/lib/ex_unit.ex

@@ -163,15 +163,15 @@ defmodule ExUnit do
   """
   def configure(options) do
     Enum.each options, fn {k, v} ->
-      :application.set_env(:ex_unit, k, v)
+      Application.put_env(:ex_unit, k, v)
     end
   end
 
   @doc """
   Returns ExUnit configuration.
   """
   def configuration do
-    :application.get_all_env(:ex_unit)
+    Application.get_all_env(:ex_unit)
   end
 
   @doc """