Merge pull request #11 from rootiest/v2.2.0

V2.2.0 A lot of bugfixes

Author: rootiest

README.md

@@ -232,12 +232,19 @@ The `setup` function accepts an optional table to configure the plugin’s behav
    `number` - Update interval in seconds.
 
 - **`notify_updates`**: (boolean) Produce update notifications  
-  Default is `false`
+  Default is `false`.
 
   Possible values are:  
   `true` - Produce update notifications at update_interval.
   `false` - Do not produce update notifications.
 
+- **`build_fresh`**: (boolean) Remove the build directory before compiling.  
+  Default is `true`.
+
+  Possible values are:  
+   `true` - Always remove the build directory before compiling.  
+   `false` - Do not remove the build directory before compiling.
+
 - **`default_keymaps`**: (boolean) Enable default keymaps.  
   Default is `false`.
 
@@ -260,6 +267,7 @@ require("nvim_updater").setup({
   update_interval = (60 * 60) * 6,     -- 6 hours default update interval
   notify_updates = false,              -- Disable update notifications
   verbose = false,                     -- Disable verbose output
+  build_fresh = true,                  -- Remove the build directory before compiling
   default_keymaps = false,              -- Disable default keymaps
 })
 ```
@@ -388,7 +396,7 @@ Available `[options]`:
 #### Show new commits
 
 ```lua
- require("nvim_updater.utils").show_new_commits( [options] )
+ require("nvim_updater").show_new_commits( [options] )
 ```
 
 This function opens a floating terminal with the new commits/changes on
@@ -406,13 +414,13 @@ Options may be specified in the following manners:
 1. Specify parameters directly: (must follow the same order as shown above)
 
    ```lua
-   require("nvim_updater.utils").show_new_commits(true, false)
+   require("nvim_updater").show_new_commits(true, false)
    ```
 
 2. Use a table: (may be specified in any order or combination)
 
    ```lua
-   require("nvim_updater.utils").show_new_commits({
+   require("nvim_updater").show_new_commits({
      isupdate = true,
      short = false
    })
@@ -473,6 +481,8 @@ Available `[TerminalOptions]`:
   Default is `false`.
 - **`autoclose`**: Whether the terminal buffer will be closed when the process ends.
   Default is `false`.
+- **`enter_insert`**: Whether the terminal should start in insert mode and maintain it when focused.
+  Default is `false`.
 - **`callback`**: A function to call when the terminal buffer is closed.
   Default is `nil`.
 
@@ -489,6 +499,7 @@ Available `[TerminalOptions]`:
   - `ev`: The [event object](https://neovim.io/doc/user/api.html#event-args)
     received from the terminal close event.
   - `exit_code`: The exit code of the process that was run in the terminal buffer.
+  - `output`: The output of the process that was run in the terminal buffer.
 
   In most cases, this will occur after the process has completed.
 

doc/nvim_updater.txt

@@ -225,11 +225,11 @@ Options may be specified in the following manners:
 
 1. Specify parameters directly: (must follow the same order as in docs)
   >lua
-   require("nvim_updater.utils").show_new_commits(true, false)
+   require("nvim_updater").show_new_commits(true, false)
 <
 2. Use a table: (may be specified in any order or combination)
   >lua
-   require("nvim_updater.utils").show_new_commits({
+   require("nvim_updater").show_new_commits({
      isupdate = true,
      short = false
    })
@@ -274,7 +274,7 @@ Available `[options]`:
 
 --- Show new commits ---
 >lua
- require("nvim_updater.utils").show_new_commits( [options] )
+ require("nvim_updater").show_new_commits( [options] )
 <
 This function opens a floating terminal with the new commits/changes on
 the remote repository vs the local src directory.
@@ -330,7 +330,8 @@ Available `[options]`:
                      Default is `false`.
 - `autoclose`    ->  Whether the terminal buffer will be closed when the process ends.
                      Default is `false`.
-
+- `enter_insert` -> Whether the terminal should start in insert mode and
+                     maintain it when focused. Default is `false`.
 - `callback`     ->  A function to call when the terminal buffer is closed.
                      Default is `nil`.
 
@@ -344,6 +345,7 @@ Available `[options]`:
   - `ev`:        -> The event object received from the terminal close event.
                     See: *event-args*
   - `exit_code`: -> The exit code of the process that was run in the terminal buffer.
+  - `output`:    -> The output of the process that was run in the terminal buffer.
 
   In most cases, this will occur after the process has completed.
 
@@ -423,15 +425,15 @@ Available configuration fields:
                        Default is `false`.
                        When set to `false`, `INFO` and `DEBUG`
                         notifications from the plugin are suppressed.
-                       Opts: `true` - Enable verbose output
-                           `false` - Disable verbose output.
+                       Opts: `true`  - Enable verbose output
+                             `false` - Disable verbose output.
 
 - `check_for_updates`: (boolean) -> Enable automatic update checks.
                        Default is `false`.
                        When set to `false`, the plugin will not
                         check for updates automatically.
-                       Opts: `true` - Enable automatic update checks.
-                           `false` - Disable automatic update checks.
+                       Opts: `true`  - Enable automatic update checks.
+                             `false` - Disable automatic update checks.
 
 - `update_interval`: (number) -> Update interval in seconds.
                        Default is `(60 * 60 * 6)` (6 hours).
@@ -443,6 +445,18 @@ Available configuration fields:
                        Default is `false`
                        When set to `true`, the plugin will produce
                         notifications for new commits.
+                       Opts: `true`  - Enable periodic update notifications.
+                             `false` - Disable periodic update notifications.
+
+- `build_fresh`: (boolean) -> Remove the build directory before compiling.
+                       Default is `true`
+                       When set to `true`, the plugin will always
+                        remove the build directory before performing an
+                        update.
+                       Opts: `true`  - Always remove the build directory before
+                                        compiling.
+                             `false` - Do not attempt to remove the build
+                                        directory before compiling.
 
 - `default_keymaps`: (boolean) -> Enable default keymaps.
                        Default is `false`.

lua/nvim_updater/init.lua

@@ -16,6 +16,7 @@ P.default_config = {
 	notify_updates = false, -- Enable update notification
 	verbose = false, -- Default verbose mode
 	default_keymaps = false, -- Use default keymaps
+	build_fresh = true, -- Always remove build dir before building
 }
 
 P.last_status = {
@@ -116,6 +117,7 @@ end
 local function update_with_retry()
 	if P.last_status.retry then
 		P.last_status.retry = false
+		utils.notify("Removal succeeded. Retrying update...", vim.log.levels.INFO, true)
 		P.update_neovim()
 	end
 end
@@ -128,6 +130,13 @@ function P.update_neovim(opts)
 	local build_type = opts.build_type ~= "" and opts.build_type or P.default_config.build_type
 	local branch = opts.branch ~= "" and opts.branch or P.default_config.branch
 
+	if P.default_config.build_fresh then
+		if utils.directory_exists(source_dir .. "/build") then
+			utils.rm_build_then_update(opts)
+			return
+		end
+	end
+
 	local notification_msg = "Starting Neovim update...\nSource: "
 		.. source_dir
 		.. "\nBranch: "
@@ -142,12 +151,15 @@ function P.update_neovim(opts)
 	if not dir_exists then
 		git_commands = "git clone https://github.com/neovim/neovim " .. source_dir .. " && cd " .. source_dir
 	else
-		git_commands = "cd " .. source_dir
+		-- Check if we're in a git repo and get current branch
+		git_commands = "cd " .. source_dir .. " && git fetch origin && "
+		
+		-- Only switch branch if we're not already on the target branch
+		git_commands = git_commands .. "test \"$(git rev-parse --abbrev-ref HEAD)\" = \"" .. branch .. "\" || "
+		git_commands = git_commands .. "git switch " .. branch .. " && "
+		git_commands = git_commands .. "git pull"
 	end
 
-	-- Checkout branch and pull latest changes
-	git_commands = git_commands .. " && git fetch origin && git checkout " .. branch .. " && git pull"
-
 	local build_command = "cd " .. source_dir .. " && make CMAKE_BUILD_TYPE=" .. build_type .. " && sudo make install"
 
 	local update_command = git_commands .. " && " .. build_command
@@ -158,14 +170,17 @@ function P.update_neovim(opts)
 		filetype = "neovim_updater_term.updating",
 		ispreupdate = false,
 		autoclose = true,
+		enter_insert = true,
 		callback = function(results)
 			if results.result_code ~= 0 then
 				utils.notify("Neovim update failed with error code: " .. results.result_code, vim.log.levels.ERROR)
-				utils.ConfirmPrompt("Remove build directory and try again?", function()
-					P.last_status.count = "?"
-					P.last_status.retry = true
-					P.remove_source_dir({ source_dir = source_dir .. "/build" })
-				end)
+				if P.default_config.build_fresh == false then
+					utils.ConfirmPrompt("Remove build directory and try again?", function()
+						P.last_status.count = "?"
+						P.last_status.retry = true
+						P.remove_source_dir({ source_dir = source_dir .. "/build" })
+					end)
+				end
 			else
 				utils.notify("Neovim update complete!", vim.log.levels.INFO, true)
 				utils.notify("Please restart Neovim for the changes to take effect.", vim.log.levels.INFO)
@@ -174,9 +189,6 @@ function P.update_neovim(opts)
 			end
 		end,
 	})
-
-	-- Go to insert mode
-	vim.cmd("startinsert")
 end
 
 --- Remove the Neovim source directory or a custom one.
@@ -225,7 +237,14 @@ function P.remove_source_dir(opts)
 				end
 
 				-- Attempt to remove with elevated privileges
-				local rm_msg = "echo Attempting to remove "
+
+				local elevate_perms_explained = ""
+				if P.default_config.verbose then
+					elevate_perms_explained = "echo Removing the directory failed using traditional methods.\n"
+						.. "echo This typically indicates a permissions issue with the directory.\n"
+				end
+				local rm_msg = elevate_perms_explained
+					.. "echo Attempting to remove "
 					.. source_dir
 					.. " directory with elevated privileges.\n"
 					.. "echo Please authorize sudo and press enter.\n"
@@ -404,12 +423,6 @@ function P.notify_new_commits(show_none, level)
 
 	local current_branch = vim.fn.system(current_branch_cmd):gsub("%s+", "") -- Trim whitespace
 
-	-- Check for errors in executing the branch command
-	if vim.v.shell_error ~= 0 then
-		utils.notify("Failed to retrieve the current branch.", vim.log.levels.ERROR)
-		return
-	end
-
 	-- Build the command to count new commits in the remote branch
 	local commit_count_cmd = ("cd %s && git rev-list --count %s..origin/%s"):format(
 		source_dir,
@@ -420,7 +433,7 @@ function P.notify_new_commits(show_none, level)
 	-- Execute the command to get the count of new commits
 	local commit_count = vim.fn.system(commit_count_cmd):gsub("%s+", "") -- Trim whitespace
 
-	-- Check for errors in executing the commit count command
+	-- Check for errors in executing the command
 	if vim.v.shell_error == 0 then
 		if tonumber(commit_count) > 0 then
 			-- Adjust the notification message based on the number of commits found