Merge pull request #2298 from alco/mix-run-errors

Report errors about missing files in the mix run task

Author: José Valim

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

@@ -55,21 +55,45 @@ defmodule Mix.Tasks.Run do
     Enum.each opts, fn({key, value}) ->
       case key do
         :parallel_require ->
-          value |> filter_patterns |> Kernel.ParallelRequire.files
+          case filter_patterns(value) do
+            [] ->
+              report_error("parallel-require: No files matched pattern #{value}")
+
+            filtered ->
+              Kernel.ParallelRequire.files(filtered)
+          end
+
         :require ->
-          value |> filter_patterns |> Enum.each &Code.require_file(&1)
+          case filter_patterns(value) do
+            [] ->
+              report_error("require: No files matched pattern #{value}")
+
+            filtered ->
+              Enum.each(filtered, &Code.require_file(&1))
+          end
+
         :eval ->
           Code.eval_string(value)
         _ ->
           :ok
       end
     end
 
-    if file, do: Code.require_file(file)
+    if file do
+      if File.regular?(file) do
+        Code.require_file(file)
+      else
+        report_error("No such file: #{file}")
+      end
+    end
     if opts[:no_halt], do: :timer.sleep(:infinity)
   end
 
   defp filter_patterns(pattern) do
     Enum.filter(Enum.uniq(Path.wildcard(pattern)), &File.regular?(&1))
   end
+
+  defp report_error(msg) do
+    raise Mix.Error, message: msg
+  end
 end

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

@@ -31,6 +31,31 @@ defmodule Mix.Tasks.RunTest do
     purge [GitRepo]
   end
 
+  test "run errors on missing files" do
+    git_repo = fixture_path("git_repo/lib/git_repo.ex")
+
+    in_fixture "no_mixfile", fn ->
+      assert_raise Mix.Error, "require: No files matched pattern non-existent", fn ->
+        Mix.Tasks.Run.run ["-r", "non-existent"]
+      end
+
+      assert_raise Mix.Error, "parallel-require: No files matched pattern non-existent", fn ->
+        Mix.Tasks.Run.run ["-pr", "non-existent"]
+      end
+
+      assert_raise Mix.Error, "No such file: non-existent", fn ->
+        Mix.Tasks.Run.run ["non-existent"]
+      end
+
+      assert File.dir?("lib")
+      assert_raise Mix.Error, "No such file: lib", fn ->
+        Mix.Tasks.Run.run ["lib"]
+      end
+    end
+  after
+    purge [GitRepo]
+  end
+
   test "run rewrites System.argv" do
     in_fixture "no_mixfile", fn ->
       file = "argv.exs"