[WIP] mix release support

bin/elixir

@@ -50,9 +50,6 @@ The following options are generally used under releases.
 It will attempt to create PIPEDIR and LOGDIR if they don't exist.
 See run_erl to learn more. To reattach, run: to_erl PIPEDIR.
 
---pipe-to automatically sets \$HEART_COMMAND if none is set.
-See the -heart mode of the Erlang VM for more information.
-
 ** Options marked with (*) can be given more than once." >&2
   exit 1
 fi
@@ -67,11 +64,20 @@ readlink_f () {
   fi
 }
 
-MODE="elixir"
-ERL_EXEC="erl"
+# Stores static erlang arguments and --erl (which is passed as is)
 ERL=""
+
+# Stores erl arguments preserving spaces/quotes (mimics an array)
+erl () {
+  eval "E$E=\$1"
+  E=$(($E + 1))
+}
+
+MODE="elixir"
 I=1
+E=0
 LENGTH=$#
+set -- "$@" -extra
 
 while [ $I -le $LENGTH ]; do
   S=1
@@ -102,59 +108,66 @@ while [ $I -le $LENGTH ]; do
     --hidden)
         ERL="$ERL -hidden"
         ;;
-    --cookie)
-        S=2
-        ERL="$ERL -setcookie "$2""
-        ;;
-    --sname|--name)
-        S=2
-        ERL="$ERL $(echo $1 | cut -c 2-) "$2""
-        ;;
     --logger-otp-reports)
         S=2
         if [ "$2" = 'true' ] || [ "$2" = 'false' ]; then
-          ERL="$ERL -logger handle_otp_reports "$2""
+          ERL="$ERL -logger handle_otp_reports $2"
         fi
         ;;
     --logger-sasl-reports)
         S=2
         if [ "$2" = 'true' ] || [ "$2" = 'false' ]; then
-          ERL="$ERL -logger handle_sasl_reports "$2""
+          ERL="$ERL -logger handle_sasl_reports $2"
         fi
         ;;
     --erl)
         S=2
-        ERL="$ERL "$2""
+        ERL="$ERL $2"
+        ;;
+    --cookie)
+        S=2
+        erl "-setcookie"
+        erl "$2"
+        ;;
+    --sname|--name)
+        S=2
+        erl $(echo $1 | cut -c 2-)
+        erl "$2"
         ;;
     --erl-config)
         S=2
-        ERL="$ERL -config "$2""
+        erl "-config"
+        erl "$2"
         ;;
     --vm-args)
         S=2
-        ERL="$ERL -args_file "$2""
+        erl "-args_file"
+        erl "$2"
         ;;
     --boot)
         S=2
-        ERL="$ERL -boot "$2""
+        erl "-boot"
+        erl "$2"
         ;;
     --boot-var)
         S=3
-        ERL="$ERL -boot_var "$2" "$3""
+        erl "-boot_var"
+        erl "$2"
+        erl "$3"
         ;;
     --pipe-to)
         S=3
         RUN_ERL_PIPE="$2"
-        if [[ "$RUN_ERL_PIPE" == "-"* ]]; then
-          echo "--pipe-to : PIPEDIR cannot be a switch" >&2
-          exit 1
-        fi
+        case "$RUN_ERL_PIPE" in
+          -*) echo "--pipe-to : PIPEDIR cannot be a switch" >&2 && exit 1;;
+          *);;
+        esac
 
         RUN_ERL_LOG="$3"
-        if [[ "$RUN_ERL_LOG" == "-"* ]]; then
-          echo "--pipe-to : LOGDIR cannot be a switch" >&2
-          exit 1
-        fi
+        case "$RUN_ERL_LOG" in
+          -*) echo "--pipe-to : LOGDIR cannot be a switch" >&2 && exit 1;;
+          *);;
+        esac
         ;;
     --werl)
         USE_WERL=true
@@ -173,9 +186,16 @@ while [ $I -le $LENGTH ]; do
   shift $S
 done
 
+I=$(($E - 1))
+while [ $I -ge 0 ]; do
+  eval "VAL=\$E$I"
+  set -- "$VAL" "$@"
+  I=$(($I - 1))
+done
+
 SELF=$(readlink_f "$0")
 SCRIPT_PATH=$(dirname "$SELF")
-ERTS_BIN=""
+ERL_EXEC="erl"
 
 if [ "$OSTYPE" = "cygwin" ]; then SCRIPT_PATH=$(cygpath -m "$SCRIPT_PATH"); fi
 if [ "$MODE" != "iex" ]; then ERL="-noshell -s elixir start_cli $ERL"; fi
@@ -186,14 +206,18 @@ else
   if [ $USE_WERL ]; then ERL_EXEC="werl"; fi
 fi
 
-set -- "$ERTS_BIN$ERL_EXEC" -pa "$SCRIPT_PATH"/../lib/*/ebin $ELIXIR_ERL_OPTIONS $ERL -extra "$@"
+ERTS_BIN=""
+set -- "$ERTS_BIN$ERL_EXEC" -pa "$SCRIPT_PATH"/../lib/*/ebin $ELIXIR_ERL_OPTIONS $ERL "$@"
 
 if [ -n "$RUN_ERL_PIPE" ]; then
+  ESCAPED=""
+  for PART in "$@"; do
+    ESCAPED=""$ESCAPED" $(echo "$PART" | sed 's/[^a-zA-Z0-9_\-\/]/\\&/g')"
+  done
   mkdir -p "$RUN_ERL_PIPE"
   mkdir -p "$RUN_ERL_LOG"
   ERL_EXEC="run_erl"
-  set -- "$ERTS_BIN$ERL_EXEC" -daemon "$RUN_ERL_PIPE/" "$RUN_ERL_LOG/" "$(printf "%q " "$@")"
-  export HEART_COMMAND=${HEART_COMMAND:-$(printf "%q " "$@")}
+  set -- "$ERTS_BIN$ERL_EXEC" -daemon "$RUN_ERL_PIPE/" "$RUN_ERL_LOG/" "$ESCAPED"
 fi
 
 exec "$@"

bin/iex.bat

@@ -1,4 +1,4 @@
-@if defined ELIXIR_CLI_ECHO (@echo on) else  (@echo off)
+@if defined ELIXIR_CLI_ECHO (@echo on) else (@echo off)
 setlocal
 if /I ""%1""==""--help"" goto documentation
 if /I ""%1""==""-h""     goto documentation

lib/mix/lib/mix/generator.ex

@@ -1,18 +1,18 @@
 defmodule Mix.Generator do
   @moduledoc """
   Conveniences for working with paths and generating content.
-
-  All of these functions are verbose, in the sense they log
-  the action to be performed via `Mix.shell/0`.
   """
 
   @doc ~S"""
   Creates a file with the given contents.
-  If the file already exists, asks for user confirmation.
+
+  If the file already exists and the contents are not the same,
+  it asks for user confirmation.
 
   ## Options
 
-    * `:force` - forces installation without a shell prompt.
+    * `:force` - forces installation without a shell prompt
+    * `:quiet` - do not log command output
 
   ## Examples
 
@@ -21,13 +21,16 @@ defmodule Mix.Generator do
       :ok
 
   """
-  @spec create_file(Path.t(), iodata, keyword) :: any
+  @spec create_file(Path.t(), iodata, keyword) :: boolean()
   def create_file(path, contents, opts \\ []) when is_binary(path) do
-    Mix.shell().info([:green, "* creating ", :reset, Path.relative_to_cwd(path)])
+    log(:green, :creating, Path.relative_to_cwd(path), opts)
 
-    if opts[:force] || Mix.Utils.can_write?(path) do
+    if opts[:force] || overwrite?(path, contents) do
       File.mkdir_p!(Path.dirname(path))
       File.write!(path, contents)
+      true
+    else
+      false
     end
   end
 
@@ -37,17 +40,70 @@ defmodule Mix.Generator do
   This function does nothing if the given directory already exists; in this
   case, it still logs the directory creation.
 
+  ## Options
+
+    * `:quiet` - do not log command output
+
   ## Examples
 
       iex> Mix.Generator.create_directory("path/to/dir")
       * creating path/to/dir
       :ok
 
   """
-  @spec create_directory(Path.t()) :: any
-  def create_directory(path) when is_binary(path) do
-    Mix.shell().info([:green, "* creating ", :reset, Path.relative_to_cwd(path)])
+  @spec create_directory(Path.t(), keyword) :: true
+  def create_directory(path, options \\ []) when is_binary(path) do
+    log(:green, "creating", Path.relative_to_cwd(path), options)
     File.mkdir_p!(path)
+    true
+  end
+
+  @doc """
+  Prompts the user to overwrite the file if it exists.
+
+  Returns false if the file exists and the user forbade
+  to override it. Returns true otherwise.
+  """
+  @doc since: "1.9.0"
+  @spec overwrite?(Path.t(), iodata) :: boolean
+  def overwrite?(path) do
+    if File.exists?(path) do
+      full = Path.expand(path)
+      Mix.shell().yes?(Path.relative_to_cwd(full) <> " already exists, overwrite?")
+    else
+      true
+    end
+  end
+
+  @doc """
+  Prompts the user to overwrite the file if it exists.
+
+  The contents are compared to avoid asking the user to
+  override if the contents did not change. Returns false
+  if the file exists and the content is the same or the
+  user forbade to override it. Returns true otherwise.
+  """
+  @doc since: "1.9.0"
+  @spec overwrite?(Path.t(), iodata) :: boolean
+  def overwrite?(path, contents) do
+    case File.read(path) do
+      {:ok, binary} ->
+        if binary == IO.iodata_to_binary(contents) do
+          false
+        else
+          full = Path.expand(path)
+          Mix.shell().yes?(Path.relative_to_cwd(full) <> " already exists, overwrite?")
+        end
+
+      _ ->
+        true
+    end
+  end
+
+  defp log(color, command, message, opts) do
+    unless opts[:quiet] do
+      Mix.shell().info([color, "* #{command} ", :reset, message])
+    end
   end
 
   @doc """