feat: add UI to update() function

nvim-neorocks · Aug 24, 2023 · 006a75e · 006a75e
1 parent 27b5f7e
commit 006a75e
Show file tree

Hide file tree

Showing 3 changed files with 68 additions and 56 deletions.
diff --git a/lua/rocks/operations.lua b/lua/rocks/operations.lua
@@ -33,21 +33,17 @@ local operations = {}
 operations.install = function(name, version)
     -- TODO(vhyrro): Input checking on name and version
     local future = nio.control.future()
-    vim.system(
-        {
-            "luarocks",
-            "--lua-version=" .. constants.LUA_VERSION,
-            "--tree=" .. config.rocks_path,
-            "install",
-            name,
-            version,
-        },
-        {},
-        function(...)
-            -- TODO: Raise an error with set_error on the future if something goes wrong
-            future.set(...)
-        end
-    )
+    vim.system({
+        "luarocks",
+        "--lua-version=" .. constants.LUA_VERSION,
+        "--tree=" .. config.rocks_path,
+        "install",
+        name,
+        version,
+    }, {}, function(...)
+        -- TODO: Raise an error with set_error on the future if something goes wrong
+        future.set(...)
+    end)
     return future
 end
 
@@ -104,7 +100,7 @@ operations.sync = function(user_rocks)
             elseif not user_rocks[key] and rocks[key] then
                 table.insert(actions, function()
                     -- NOTE: This will fail if it breaks dependencies.
-                    -- That is generall good, although we definitely want a handler
+                    -- That is generally good, although we definitely want a handler
                     -- that ignores this.
                     -- To my knowledge there is no way to query all rocks that are *not*
                     -- dependencies.
@@ -123,33 +119,57 @@ operations.sync = function(user_rocks)
 
         if not vim.tbl_isempty(actions) then
             -- TODO: Error handling
-            local _tasks = nio.gather(actions)
-            vim.print("Everything is now in-sync!")
-        else
-            vim.print("Nothing to synchronize!")
+            nio.gather(actions)
         end
+        vim.print("done!")
     end)
 end
 
 operations.update = function()
-    nio.run(function()
+    require("nio").run(function()
+        local Split = require("nui.split")
+        local NuiText = require("nui.text")
+
         local outdated_rocks = state.outdated_rocks()
         local actions = {}
 
+        nio.scheduler()
+
+        local split = Split({
+            relative = "editor",
+            position = "right",
+            size = "33%",
+        })
+
+        for i = 1, vim.tbl_count(outdated_rocks) - 1 do
+            vim.api.nvim_buf_set_lines(split.bufnr, i, i, true, { "" })
+        end
+
+        local linenr = 1
+
         for name, rock in pairs(outdated_rocks) do
+            local display_text = "Updating '" .. name .. "'"
+            local text = NuiText(display_text)
+            local linenr_copy = linenr
+
+            text:render_char(split.bufnr, -1, linenr_copy, 0, linenr_copy, display_text:len())
+
             table.insert(actions, function()
-                return operations.install(name, rock.target_version).wait()
+                local ret = operations.install(name, rock.target_version).wait()
+                nio.scheduler()
+                text:set("Updated '" .. name .. "'")
+                text:render_char(split.bufnr, -1, linenr_copy, 0, linenr_copy, display_text:len())
+                return ret
             end)
+
+            linenr = linenr + 1
         end
 
+        split:mount()
+
         if not vim.tbl_isempty(actions) then
-            nio.gather(actions)
-            vim.print("Update complete!")
-        else
-            vim.print("Nothing to update!")
+            return nio.gather(actions)
         end
-
-        -- TODO: Update the user configuration to reflect the new state.
     end)
 end
 

diff --git a/lua/rocks/setup.lua b/lua/rocks/setup.lua
@@ -33,8 +33,7 @@ local function bootstrap_install(name, version)
         "install",
         name,
         version,
-    })
-        :wait()
+    }):wait()
 end
 
 --- Initialize rocks.nvim
@@ -57,17 +56,14 @@ function setup.init()
     local is_toml_installed, _ = pcall(require, "toml")
 
     if not is_toml_installed then
-        vim.ui.select(
-            { "Ok" },
-            {
-                prompt = "Installing 'toml' dependency by using luarocks. This requires compiling C++ code so it may take a while, please wait ...",
-            },
-            function()
-                vim.schedule(function()
-                    bootstrap_install("toml", "0.3.0-0")
-                end)
-            end
-        )
+        vim.ui.select({ "Ok" }, {
+            prompt = "Installing 'toml' dependency by using luarocks. This requires compiling C++ code so it may take a while, please wait ...",
+        }, function()
+            vim.schedule(function()
+                bootstrap_install("toml", "0.3.0-0")
+                bootstrap_install("nui.nvim", "0.2.0-1")
+            end)
+        end)
     end
 end
 

diff --git a/lua/rocks/state.lua b/lua/rocks/state.lua
@@ -57,21 +57,17 @@ state.outdated_rocks = nio.create(function()
 
     local future = nio.control.future()
 
-    vim.system(
-        {
-            "luarocks",
-            "--lua-version=" .. constants.LUA_VERSION,
-            "--tree=" .. config.rocks_path,
-            "list",
-            "--porcelain",
-            "--outdated",
-        },
-        { text = true },
-        function(obj)
-            -- TODO: Error handling
-            future.set(obj.stdout)
-        end
-    )
+    vim.system({
+        "luarocks",
+        "--lua-version=" .. constants.LUA_VERSION,
+        "--tree=" .. config.rocks_path,
+        "list",
+        "--porcelain",
+        "--outdated",
+    }, { text = true }, function(obj)
+        -- TODO: Error handling
+        future.set(obj.stdout)
+    end)
 
     local installed_rock_list = future.wait()