Fix command-line arguments handling in Mix.Tasks.Run

Author: lexmag

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

@@ -34,18 +34,20 @@ 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])
+      switches: [parallel_require: :keep, require: :keep, eval: :keep])
 
     # Require the project to be available
     Mix.Project.get!
 
-    file =
-      case head do
-        ["--"|t] -> System.argv(t); nil
-        [h|t]    -> System.argv(t); h
-        []       -> System.argv([]); nil
+    {file, argv} =
+      case {Keyword.has_key?(opts, :eval), head} do
+        {true, _}  -> {nil, head}
+        {_, [h|t]} -> {h, t}
+        {_, []}    -> {nil, []}
       end
 
+    System.argv(argv)
+
     # Start app after rewriting System.argv,
     # but before requiring and evaling
     Mix.Task.run "app.start", args

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

@@ -13,8 +13,11 @@ defmodule Mix.Tasks.RunTest do
     end
   end
 
-  test "run requires files before evaling commands" do
+  setup do
     Mix.Project.push MixTest.Case.Sample
+  end
+
+  test "run requires files before evaling commands" do
     git_repo = fixture_path("git_repo/lib/git_repo.ex")
 
     in_fixture "no_mixfile", fn ->
@@ -27,4 +30,33 @@ defmodule Mix.Tasks.RunTest do
   after
     purge [GitRepo]
   end
+
+  test "run rewrites System.argv" do
+    in_fixture "no_mixfile", fn ->
+      File.write! file = "argv.exs", "send self, {:system_argv, System.argv}"
+      unload_file = fn ->
+        Code.unload_files [Path.expand(file)]
+      end
+
+      Mix.Tasks.Run.run [file]
+      assert_received {:system_argv, []}
+
+      unload_file.()
+      Mix.Tasks.Run.run [file, "foo", "-e", "bar"]
+      assert_received {:system_argv, ["foo", "-e", "bar"]}
+
+      unload_file.()
+      Mix.Tasks.Run.run ["-e", "send self, {:system_argv, System.argv}", file, "foo", "-x", "bar"]
+      assert_received {:system_argv, [file, "foo", "-x", "bar"]}
+
+      unload_file.()
+      Mix.Tasks.Run.run [
+        "-e", "send self, :evaled",
+        "-e", "send self, {:system_argv, System.argv}",
+        "--no-compile", file, "-x", "bar"
+      ]
+      assert_received :evaled
+      assert_received {:system_argv, [file, "-x", "bar"]}
+    end
+  end
 end