fix: honor --yes or -y option when adding a satsolver

chore: dialyzer specs for read_one
ash-project · Oct 7, 2024 · 926158e · 926158e
1 parent 573cc08
commit 926158e
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 14 deletions.
diff --git a/lib/ash.ex b/lib/ash.ex
@@ -2023,7 +2023,7 @@ defmodule Ash do
   """
   @doc spark_opts: [{1, @read_one_opts_schema}]
   @spec read_one(resource_or_query :: Ash.Query.t() | Ash.Resource.t(), opts :: Keyword.t()) ::
-    Ash.Resource.record() | nil
+          Ash.Resource.record() | nil
   def read_one!(query, opts \\ []) do
     Ash.Helpers.expect_resource_or_query!(query)
     Ash.Helpers.expect_options!(opts)
@@ -2052,7 +2052,7 @@ defmodule Ash do
   """
   @doc spark_opts: [{1, @read_one_opts_schema}]
   @spec read_one(resource_or_query :: Ash.Query.t() | Ash.Resource.t(), opts :: Keyword.t()) ::
-    {:ok, Ash.Resource.record() | nil} | {:error, Ash.Error.t()}
+          {:ok, Ash.Resource.record() | nil} | {:error, Ash.Error.t()}
   def read_one(query, opts \\ []) do
     Ash.Helpers.expect_options!(opts)
     Ash.Helpers.expect_resource_or_query!(query)

diff --git a/lib/ash/policy/authorizer/authorizer.ex b/lib/ash/policy/authorizer/authorizer.ex
@@ -528,24 +528,30 @@ defmodule Ash.Policy.Authorizer do
     )
   end
 
-  def install(igniter, module, type, _path, _argv) do
+  def install(igniter, module, type, _path, argv) do
+    yes = "--yes" in argv or "-y" in argv
+
     igniter =
       with nil <- Igniter.Project.Deps.get_dependency_declaration(igniter, :picosat_elixir),
            nil <- Igniter.Project.Deps.get_dependency_declaration(igniter, :simple_sat) do
         solver =
-          Owl.IO.select(
-            [
-              {:picosat_elixir, "~> 0.2"},
-              {:simple_sat, "~> 0.1"}
-            ],
-            label:
-              "Ash.Policy.Authorizer requires a sat solver. Which would you like to use? If on windows, use `simple_sat`, otherwise, use `picosat_elixir`.",
-            render_as: &to_string(elem(&1, 0))
-          )
+          if yes do
+            {:picosat_elixir, "~> 0.2"}
+          else
+            Owl.IO.select(
+              [
+                {:picosat_elixir, "~> 0.2"},
+                {:simple_sat, "~> 0.1"}
+              ],
+              label:
+                "Ash.Policy.Authorizer requires a sat solver. Which would you like to use? If on windows, use `simple_sat`, otherwise, use `picosat_elixir`.",
+              render_as: &to_string(elem(&1, 0))
+            )
+          end
 
         igniter
-        |> Igniter.Project.Deps.add_dep(solver)
-        |> Igniter.apply_and_fetch_dependencies()
+        |> Igniter.Project.Deps.add_dep(solver, yes?: yes)
+        |> Igniter.apply_and_fetch_dependencies(yes: yes)
       else
         _ ->
           igniter