WIP: a few more

src/alire/alire-config-builtins.ads

@@ -95,8 +95,26 @@ package Alire.Config.Builtins is
    --  not listed as a built-in. Each tool is a child of this key,
    --  e.g.: toolchain.use.gnat, toolchain.use.gprbuild
 
+   --  UPDATE
+
+   Update_Manually_Only : constant Builtin := New_Builtin
+     (Key  => "update.manually_only",
+      Def  => False,
+      Help =>
+        "If true, Alire will not attempt to update dependencies even after "
+         & "the manifest is manually edited, or when no valid solution has "
+         & "been ever computed. All updates have to be manually requested "
+         & "through `alr update`");
+
    --  WARNINGS
 
+   Warning_Caret : constant Builtin := New_Builtin
+     (Key  => "warning.caret",
+      Def  => True,
+      Help =>
+        "If true, Alire will warn about the use of caret (^) for pre-1 "
+      & "dependencies, for which tilde (~) is recommended instead.");
+
    Warning_Old_Index : constant Builtin := New_Builtin
      (Key  => "warning.old_index",
       Def  => True,

src/alire/alire-config-edit.ads

@@ -113,19 +113,7 @@ package Alire.Config.Edit is
        Cfg_String,
        +("URL of the executable msys2 installer, " &
            "e.g. 'https://github.com/msys2/msys2-installer/releases/" &
-           "download/2022-03-19/msys2-x86_64-20220319.exe'. (Windows only)")),
-
-      (+Keys.Update_Manually,
-       Cfg_Bool,
-       +("If true, Alire will not attempt to update dependencies even after "
-         & "the manifest is manually edited, or when no valid solution has "
-         & "been ever computed. All updates have to be manually requested "
-         & "through `alr update`")),
-
-      (+Keys.Warning_Caret,
-       Cfg_Bool,
-       +("If true, Alire will warn about the use of caret (^) "
-         & "for pre-1 dependencies."))
+           "download/2022-03-19/msys2-x86_64-20220319.exe'. (Windows only)"))
 
      );
 

src/alire/alire-config.ads

@@ -83,17 +83,10 @@ package Alire.Config is
 
       use CLIC.Config;
 
-      Update_Manually   : constant Config_Key := "update-manually-only";
-      --  Used by `get --only` to flag a workspace to not autoupdate itself
-      --  despite having no solution in the lockfile.
-
       User_Email        : constant Config_Key := "user.email";
       User_Name         : constant Config_Key := "user.name";
       User_Github_Login : constant Config_Key := "user.github_login";
 
-      Warning_Caret : constant Config_Key := "warning.caret";
-      --  Set to false to disable warnings about caret/tilde use for ^0 deps.
-
       Msys2_Do_Not_Install : constant Config_Key := "msys2.do_not_install";
       Msys2_Install_Dir    : constant Config_Key := "msys2.install_dir";
       Msys2_Installer      : constant Config_Key := "msys2.installer";

src/alire/alire-releases.adb

@@ -1,7 +1,7 @@
 with Ada.Directories;
 with Ada.Text_IO;
 
-with Alire.Config;
+with Alire.Config.Builtins;
 with Alire.Crates;
 with Alire.Directories;
 with Alire.Defaults;
@@ -85,7 +85,7 @@ package body Alire.Releases is
       Newline    : constant String := ASCII.LF & "   ";
    begin
       for Dep of This.Flat_Dependencies loop
-         if Config.DB.Get (Config.Keys.Warning_Caret, Default => True)
+         if Config.Builtins.Warning_Caret.Get
            and then
            AAA.Strings.Contains (Dep.Versions.Image, "^0")
          then
@@ -98,7 +98,7 @@ package body Alire.Releases is
                & "The suspicious dependency is: " & TTY.Version (Dep.Image)
                & Newline
                & "You can disable this warning by setting the option "
-               & TTY.Emph (Config.Keys.Warning_Caret) & " to false.",
+               & TTY.Emph (Config.Builtins.Warning_Caret.Key) & " to false.",
                Warnings.Caret_Or_Tilde);
             return True;
          end if;

src/alr/alr-commands-get.adb

@@ -1,6 +1,6 @@
 with Ada.Directories;
 
-with Alire.Config.Edit;
+with Alire.Config.Builtins;
 with Alire.Dependencies;
 with Alire.Directories;
 with Alire.Index;
@@ -161,10 +161,8 @@ package body Alr.Commands.Get is
             Trace.Info ("Because --only was used, automatic dependency" &
                           " retrieval is disabled in this workspace:" &
                           " use `alr update` to apply dependency changes");
-            Alire.Config.Edit.Set_Boolean
-              (Alire.Config.Local,
-               Alire.Config.Keys.Update_Manually,
-               True);
+            Alire.Config.Builtins.Update_Manually_Only.Set (Alire.Config.Local,
+                                                            True);
 
             if not CLIC.User_Input.Not_Interactive then
                Alire.Roots.Print_Nested_Crates (Cmd.Root.Path);

src/alr/alr-commands.adb

@@ -9,6 +9,7 @@ with CLIC.User_Input;
 
 with Alire.Platforms;
 with Alire_Early_Elaboration;
+with Alire.Config.Builtins;
 with Alire.Config.Edit;
 with Alire.Errors;
 with Alire.Index_On_Disk.Loading;
@@ -288,8 +289,7 @@ package body Alr.Commands is
       Unchecked : Alire.Roots.Optional.Root renames Cmd.Optional_Root;
 
       Manual_Only : constant Boolean :=
-                      Alire.Config.DB.Get
-                        (Alire.Config.Keys.Update_Manually, False);
+                      Alire.Config.Builtins.Update_Manually_Only.Get;
 
       package Conf renames Alire.Config;
    begin