Merge pull request #2289 from lexmag/master

Change `OptionParser` to remove `--`. Fix command-line arguments handling.

Author: José Valim

lib/elixir/lib/code.ex

@@ -463,7 +463,7 @@ defmodule Code do
     if File.regular?(file) do
       file
     else
-      raise LoadError, file: file
+      raise Code.LoadError, file: file
     end
   end
 end

lib/elixir/lib/kernel/cli.ex

@@ -178,7 +178,11 @@ defmodule Kernel.CLI do
       "-" <> _ ->
         shared_option? list, config, &process_argv(&1, &2)
       _ ->
-        {%{config | commands: [{:file, h} | config.commands]}, t}
+        if Keyword.has_key?(config.commands, :eval) do
+          {config, list}
+        else
+          {%{config | commands: [{:file, h} | config.commands]}, t}
+        end
     end
   end
 

lib/elixir/lib/option_parser.ex

@@ -120,8 +120,8 @@ defmodule OptionParser do
     parse(argv, aliases, switches, [], [], [], all)
   end
 
-  defp parse(["--"|_] = value, _aliases, _switches, dict, args, invalid, _all) do
-    {Enum.reverse(dict), Enum.reverse(args, value), Enum.reverse(invalid)}
+  defp parse(["--"|t], _aliases, _switches, dict, args, invalid, _all) do
+    {Enum.reverse(dict), Enum.reverse(args, t), Enum.reverse(invalid)}
   end
 
   defp parse(["-" <> option|t], aliases, switches, dict, args, invalid, all) do

lib/elixir/test/elixir/code_test.exs

@@ -70,6 +70,10 @@ defmodule CodeTest do
 
   test :eval_file do
     assert Code.eval_file(fixture_path("code_sample.exs")) == {3, [var: 3]}
+
+    assert_raise Code.LoadError, fn ->
+      Code.eval_file("non_existent.exs")
+    end
   end
 
   test :require do

lib/elixir/test/elixir/kernel/cli_test.exs

@@ -7,9 +7,17 @@ defmodule Kernel.CLI.InitTest do
 
   test "handles code on initialization" do
     assert elixir('-e "IO.puts [?3]"') == '3\n'
+    assert elixir('#{fixture_path("init_sample.exs")}') == '3\n'
+  end
+
+  test "argv handling" do
+    expected = '#{inspect ["sample.exs", "-o", "1", "2"]}\n'
+    assert elixir('-e "IO.puts inspect(System.argv)" sample.exs -o 1 2') == expected
+    assert elixir('-e "IO.puts inspect(System.argv)" -- sample.exs -o 1 2') == expected
+    assert elixir('-e "IO.puts inspect(System.argv)" --hidden sample.exs -o 1 2') == expected
 
-    result = elixir('-e "IO.puts inspect(System.argv)" #{fixture_path("init_sample.exs")} -o 1 2 3')
-    assert result == '#{inspect ["-o", "1", "2", "3"]}\n3\n'
+    result = elixir('-e "IO.puts inspect(System.argv)" -- --hidden sample.exs -o 1 2')
+    assert result == '#{inspect ["--hidden", "sample.exs", "-o", "1", "2"]}\n'
   end
 end
 

lib/elixir/test/elixir/option_parser_test.exs

@@ -154,12 +154,15 @@ defmodule OptionParserTest do
 
   test "stops on --" do
     options = OptionParser.parse(["--source", "from_docs/", "--", "1", "2", "3"])
-    assert options == {[source: "from_docs/"], ["--", "1", "2", "3"], []}
+    assert options == {[source: "from_docs/"], ["1", "2", "3"], []}
 
     options = OptionParser.parse_head(["--source", "from_docs/", "--", "1", "2", "3"])
-    assert options == {[source: "from_docs/"], ["--", "1", "2", "3"], []}
+    assert options == {[source: "from_docs/"], ["1", "2", "3"], []}
 
     options = OptionParser.parse(["--no-dash", "foo", "bar", "--", "-x"])
+    assert options == {[no_dash: true], ["foo", "bar", "-x"], []}
+
+    options = OptionParser.parse_head(["--no-dash", "foo", "bar", "--", "-x"])
     assert options == {[no_dash: true], ["foo", "bar", "--", "-x"], []}
   end
 

lib/mix/lib/mix/scm/git.ex

@@ -17,7 +17,7 @@ defmodule Mix.SCM.Git do
         case Enum.find_value [:branch, :ref, :tag], &List.keyfind(lock_opts, &1, 0) do
           {:ref, _}  -> lock <> " (ref)"
           {key, val} -> lock <> " (#{key}: #{val})"
-          nil          -> lock
+          nil        -> lock
         end
       _ ->
         nil

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