fix: don't silently ignore certain errors during spinners

fix: don't display "temporarily adding igniter" when we aren't

closes #331
closes #333

Author: zachdaniel

installer/lib/loading.ex

@@ -68,15 +68,8 @@ defmodule Igniter.Installer.Loading do
             |> elem(0)
           end)
           |> elem(0)
-        rescue
-          e ->
-            Process.put(:spinner_error, true)
-            Mix.shell(shell)
-            Mix.shell().info(Igniter.Installer.CaptureServer.device_output(:standard_error, ref))
-            reraise e, __STACKTRACE__
         catch
           kind, reason ->
-            File.write("catch_output", inspect({kind, reason}))
             Process.put(:spinner_error, true)
             Mix.shell(shell)
             Mix.shell().info(Igniter.Installer.CaptureServer.device_output(:standard_error, ref))

installer/lib/task_helpers.ex

@@ -191,21 +191,21 @@ defmodule Igniter.Installer.TaskHelpers do
       |> File.read!()
 
     new_contents =
+      new_contents =
+      contents
+      |> add_igniter_dep()
+
+    if contents == new_contents do
+      contents
+    else
       Igniter.Installer.Loading.with_spinner(
         "temporarily adding igniter",
         fn ->
-          new_contents =
-            contents
-            |> add_igniter_dep()
-
-          if contents == new_contents do
-            contents
-          else
-            new_contents
-            |> Code.format_string!()
-          end
+          new_contents
+          |> Code.format_string!()
         end
       )
+    end
 
     if new_contents == contents && !String.contains?(contents, "{:igniter,") do
       Mix.shell().error("""

lib/igniter/extensions/phoenix.ex

@@ -21,9 +21,9 @@ defmodule Igniter.Extensions.Phoenix do
 
     cond do
       # Check if this is a LiveView/LiveComponent module but NOT if "Live" is just a namespace
-      String.ends_with?(Enum.at(split, 1) || "", "Live") && 
-        # Exclude the case where element 1 is exactly "Live" (namespace usage)
-        Enum.at(split, 1) != "Live" ->
+      # Exclude the case where element 1 is exactly "Live" (namespace usage)
+      String.ends_with?(Enum.at(split, 1) || "", "Live") &&
+          Enum.at(split, 1) != "Live" ->
         [base | rest] = split
 
         {:ok,

lib/igniter/util/install.ex

@@ -209,7 +209,9 @@ defmodule Igniter.Util.Install do
   end
 
   def get_deps!(igniter, opts) do
-    case System.cmd("mix", ["deps.get"], stderr_to_stdout: true) do
+    case Igniter.Util.Loading.with_spinner("fetching deps", fn ->
+           raising_cmd!("mix", ["deps.get"], stderr_to_stdout: true)
+         end) do
       {_output, 0} ->
         Igniter.Util.Loading.with_spinner(
           opts[:operation] || "building deps",
@@ -220,14 +222,14 @@ defmodule Igniter.Util.Install do
                   igniter
 
                 [:all] ->
-                  System.cmd("mix", ["deps.update", "--all" | opts[:update_deps_args] || []],
+                  raising_cmd!("mix", ["deps.update", "--all" | opts[:update_deps_args] || []],
                     stderr_to_stdout: true
                   )
 
                   %{igniter | rewrite: Rewrite.drop(igniter.rewrite, ["mix.lock"])}
 
                 to_update ->
-                  System.cmd(
+                  raising_cmd!(
                     "mix",
                     ["deps.update" | to_update] ++ (opts[:update_deps_args] || []),
                     stderr_to_stdout: true
@@ -251,8 +253,8 @@ defmodule Igniter.Util.Install do
 
               igniter =
                 if Keyword.get(opts, :compile_deps?, true) do
-                  System.cmd("mix", ["deps.get"], stderr_to_stdout: true)
-                  System.cmd("mix", ["deps.compile"], stderr_to_stdout: true)
+                  raising_cmd!("mix", ["deps.get"], stderr_to_stdout: true)
+                  raising_cmd!("mix", ["deps.compile"], stderr_to_stdout: true)
 
                   %{igniter | rewrite: Rewrite.drop(igniter.rewrite, ["mix.lock"])}
                 else
@@ -292,6 +294,22 @@ defmodule Igniter.Util.Install do
     end
   end
 
+  defp raising_cmd!(cmd, args, opts) do
+    case System.cmd(cmd, args, opts) do
+      {output, 0} ->
+        {output, 0}
+
+      {output, n} ->
+        raise """
+        #{cmd} #{Enum.join(args, " ")} exited with status: #{n}
+
+        Output:
+
+        #{output}
+        """
+    end
+  end
+
   defp handle_error(output, _exit_code, igniter, opts) do
     if String.contains?(output, "Dependencies have diverged") do
       handle_diverged_dependencies(output, igniter, opts)

lib/igniter/util/loading.ex

@@ -66,15 +66,8 @@ defmodule Igniter.Util.Loading do
             |> elem(0)
           end)
           |> elem(0)
-        rescue
-          e ->
-            Process.put(:spinner_error, true)
-            Mix.shell(shell)
-            Mix.shell().info(Igniter.CaptureServer.device_output(:standard_error, ref))
-            reraise e, __STACKTRACE__
         catch
           kind, reason ->
-            File.write("catch_output", inspect({kind, reason}))
             Process.put(:spinner_error, true)
             Mix.shell(shell)
             Mix.shell().info(Igniter.CaptureServer.device_output(:standard_error, ref))

test/igniter/extensions/phoenix_test.exs

@@ -84,47 +84,47 @@ defmodule Igniter.Extensions.PhoenixTest do
       igniter =
         test_project()
         |> Igniter.Project.IgniterConfig.add_extension(Igniter.Extensions.Phoenix)
-      
+
       module_name = MyApp.Live.Dashboard.TestLive
-      
-      igniter = 
+
+      igniter =
         Igniter.Project.Module.create_module(igniter, module_name, """
         @moduledoc "Test module"
         def hello, do: :world
         """)
-      
-      {:ok, {_igniter, source, _zipper}} = 
+
+      {:ok, {_igniter, source, _zipper}} =
         Igniter.Project.Module.find_module(igniter, module_name)
-      
+
       actual_path = Rewrite.Source.get(source, :path)
-      
+
       refute actual_path =~ ~r/live\/live/,
-        "Module path should not contain duplicate 'live/live' directories. Got: #{actual_path}"
-      
+             "Module path should not contain duplicate 'live/live' directories. Got: #{actual_path}"
+
       assert actual_path == "lib/my_app/live/dashboard/test_live.ex"
     end
 
     test "correctly handles LiveView modules with Web prefix" do
       igniter =
         test_project()
         |> Igniter.Project.IgniterConfig.add_extension(Igniter.Extensions.Phoenix)
-      
+
       module_name = TestWeb.DashboardLive
-      
-      igniter = 
+
+      igniter =
         Igniter.Project.Module.create_module(igniter, module_name, """
         use TestWeb, :live_view
-        
+
         def render(assigns) do
           ~H"<div>Test</div>"
         end
         """)
-      
-      {:ok, {_igniter, source, _zipper}} = 
+
+      {:ok, {_igniter, source, _zipper}} =
         Igniter.Project.Module.find_module(igniter, module_name)
-      
+
       actual_path = Rewrite.Source.get(source, :path)
-      
+
       assert actual_path == "lib/test_web/live/dashboard_live.ex"
     end
   end