Apply suggestions from code review

Co-authored-by: Eksperimental <[email protected]>

Author: Papipo

lib/mix/lib/mix/dep/loader.ex

@@ -84,7 +84,7 @@ defmodule Mix.Dep.Loader do
   def load(%Mix.Dep{manager: manager, scm: scm, opts: opts} = dep, children, locked?) do
     # The manager for a child dependency is set based on the following rules:
     #   1. Set in dependency definition
-    #   2. From SCM, so that Hex dependencies of a rebar/gleam project can be compiled with mix
+    #   2. From SCM, so that Hex dependencies of a Rebar/Gleam project can be compiled with Mix
     #   3. From the parent dependency, used for rebar dependencies from git
     #   4. Inferred from files in dependency (mix.exs, rebar.config, Makefile, gleam.toml)
     manager = opts[:manager] || scm_manager(scm, opts) || manager || infer_manager(opts[:dest])
@@ -369,9 +369,9 @@ defmodule Mix.Dep.Loader do
 
   defp gleam_dep(%Mix.Dep{opts: opts} = dep, _children = nil, manager, locked?) do
     Mix.Gleam.require!()
-
-    config = File.cd!(opts[:dest], fn -> Mix.Gleam.load_config(".") end)
-    from = Path.join(opts[:dest], "gleam.toml")
+    dest = opts[:dest]
+    config = File.cd!(dest, fn -> Mix.Gleam.load_config(".") end)
+    from = Path.join(dest, "gleam.toml")
     deps = Enum.map(config[:deps], &to_dep(&1, from, manager, locked?))
 
     {dep, deps}

lib/mix/lib/mix/gleam.ex

@@ -1,37 +1,39 @@
+# SPDX-License-Identifier: Apache-2.0
+# SPDX-FileCopyrightText: 2021 The Elixir Team
+# SPDX-FileCopyrightText: 2012 Plataformatec
+
 defmodule Mix.Gleam do
   # Version that introduced `gleam export package-information` command
   @required_gleam_version ">= 1.10.0"
 
   def load_config(dir) do
     File.cd!(dir, fn ->
-      gleam!(["export", "package-information", "--out", "/dev/stdout"])
+      gleam!(~W(export package-information --out /dev/stdout))
       |> JSON.decode!()
       |> Map.fetch!("gleam.toml")
       |> parse_config()
     end)
   end
 
   def parse_config(json) do
-    try do
-      deps =
-        Map.get(json, "dependencies", %{})
-        |> Enum.map(&parse_dep/1)
-
-      dev_deps =
-        Map.get(json, "dev-dependencies", %{})
-        |> Enum.map(&parse_dep(&1, only: :dev))
-
-      %{
-        name: Map.fetch!(json, "name"),
-        version: Map.fetch!(json, "version"),
-        deps: deps ++ dev_deps
-      }
-      |> maybe_gleam_version(json)
-      |> maybe_erlang_opts(json)
-    rescue
-      KeyError ->
-        Mix.raise("Command \"gleam export package-information\" unexpected format: \n" <> json)
-    end
+    deps =
+      Map.get(json, "dependencies", %{})
+      |> Enum.map(&parse_dep/1)
+
+    dev_deps =
+      Map.get(json, "dev-dependencies", %{})
+      |> Enum.map(&parse_dep(&1, only: :dev))
+
+    %{
+      name: Map.fetch!(json, "name"),
+      version: Map.fetch!(json, "version"),
+      deps: deps ++ dev_deps
+    }
+    |> maybe_gleam_version(json)
+    |> maybe_erlang_opts(json)
+  rescue
+    KeyError ->
+      Mix.raise("Command \"gleam export package-information\" unexpected format: \n" <> json)
   end
 
   defp parse_dep({dep, requirement}, opts \\ []) do
@@ -84,35 +86,31 @@ defmodule Mix.Gleam do
   end
 
   defp available_version do
-    try do
-      case gleam!(["--version"]) do
-        "gleam " <> version -> Version.parse!(version) |> Version.to_string()
-        output -> Mix.raise("Command \"gleam --version\" unexpected format: #{output}")
-      end
-    rescue
-      e in Version.InvalidVersionError ->
-        Mix.raise("Command \"gleam --version\" invalid version format: #{e.version}")
+    case gleam!(["--version"]) do
+      "gleam " <> version -> Version.parse!(version) |> Version.to_string()
+      output -> Mix.raise("Command \"gleam --version\" unexpected format: #{output}")
     end
+  rescue
+    e in Version.InvalidVersionError ->
+      Mix.raise("Command \"gleam --version\" invalid version format: #{e.version}")
   end
 
   defp gleam!(args) do
-    try do
-      System.cmd("gleam", args)
-    catch
-      :error, :enoent ->
-        Mix.raise(
-          "The \"gleam\" executable is not available in your PATH. " <>
-            "Please install it, as one of your dependencies requires it. "
-        )
-    else
-      {response, 0} ->
-        String.trim(response)
-
-      {response, _} when is_binary(response) ->
-        Mix.raise("Command \"gleam #{Enum.join(args, " ")}\" failed with reason: #{response}")
-
-      {_, _} ->
-        Mix.raise("Command \"gleam #{Enum.join(args, " ")}\" failed")
-    end
+    System.cmd("gleam", args)
+  catch
+    :error, :enoent ->
+      Mix.raise(
+        "The \"gleam\" executable is not available in your PATH. " <>
+          "Please install it, as one of your dependencies requires it. "
+      )
+  else
+    {response, 0} ->
+      String.trim(response)
+
+    {response, _} when is_binary(response) ->
+      Mix.raise("Command \"gleam #{Enum.join(args, " ")}\" failed with reason: #{response}")
+
+    {_, _} ->
+      Mix.raise("Command \"gleam #{Enum.join(args, " ")}\" failed")
   end
 end

lib/mix/lib/mix/tasks/deps.compile.ex

@@ -334,18 +334,7 @@ defmodule Mix.Tasks.Deps.Compile do
 
     command =
       {"gleam",
-       [
-         "compile-package",
-         "--no-beam",
-         "--target",
-         "erlang",
-         "--package",
-         package,
-         "--out",
-         out,
-         "--lib",
-         lib
-       ]}
+       ~w(compile-package --no-beam --target erlang --package #{package} --out #{out} --lib #{lib})}
 
     shell_cmd!(dep, config, command)
 

lib/mix/lib/mix/tasks/deps.ex

@@ -101,7 +101,7 @@ defmodule Mix.Tasks.Deps do
     * `:override` - if set to `true` the dependency will override any other
       definitions of itself by other dependencies
 
-    * `:manager` - Mix can also compile Rebar3, makefile and gleam projects
+    * `:manager` - Mix can also compile Rebar3, makefile and Gleam projects
       and can fetch sub dependencies of Rebar3 projects. Mix will
       try to infer the type of project but it can be overridden with this
       option by setting it to `:mix`, `:rebar3`, `:make` or `:gleam`. In case

lib/mix/test/fixtures/gleam_dep/.gitignore

@@ -1,4 +1,11 @@
+# The directory Mix will write compiled artifacts to.
+/_build/
+
+# If the VM crashes, it generates a dump, let's ignore it too.
+erl_crash.dump
+
+# BEAM bytecode files.
 *.beam
+
+# Also ignore archive artifacts (built via "mix archive.build").
 *.ez
-/build
-erl_crash.dump

lib/mix/test/mix/gleam_test.exs

@@ -37,7 +37,7 @@ defmodule Mix.GleamTest do
     end
   end
 
-  describe "gleam export package-information format" do
+  describe "Gleam export package-information format" do
     test "parse_config" do
       config =
         %{