Refactor milestone logic (#871)

* sub _ for - in commands * refactor to use command syntax * add some tests
pwntester · Feb 20, 2025 · dc67d3f · dc67d3f
1 parent 2c1647e
commit dc67d3f
Show file tree

Hide file tree

Showing 3 changed files with 64 additions and 22 deletions.
diff --git a/lua/octo/gh/init.lua b/lua/octo/gh/init.lua
@@ -204,12 +204,19 @@ end
 ---Insert the options into the args table
 ---@param args table the arguments table
 ---@param options table the options to insert
+---@param replace table key value pairs to replace in the key of the options
 ---@return table the updated args table
-M.insert_args = function(args, options)
+M.insert_args = function(args, options, replace)
+  replace = replace or {}
+
   for key, value in pairs(options) do
     if type(key) == "number" then
       table.insert(args, value)
     else
+      for k, v in pairs(replace) do
+        key = string.gsub(key, k, v)
+      end
+
       local flag = create_flag(key)
 
       if type(value) == "table" then
@@ -297,7 +304,7 @@ local create_subcommand = function(command)
         }
 
         opts.opts = nil
-        args = M.insert_args(args, opts)
+        args = M.insert_args(args, opts, { ["_"] = "-" })
 
         return M.run {
           args = args,

diff --git a/lua/octo/utils.lua b/lua/octo/utils.lua
@@ -329,17 +329,17 @@ end
 ---@param milestone_name string milestone name
 function M.add_milestone(issue, number, milestone_name)
   local command = issue and "issue" or "pr"
-  local args = { command, "edit", number, "--milestone", milestone_name }
 
-  gh.run {
-    args = args,
-    cb = function(output, stderr)
-      if stderr and not M.is_blank(stderr) then
-        M.error(stderr)
-      elseif output then
-        M.info("Added milestone " .. milestone_name)
-      end
-    end,
+  gh[command].edit {
+    number,
+    milestone = milestone_name,
+    opts = {
+      cb = gh.create_callback {
+        success = function(_)
+          M.info("Added milestone " .. milestone_name)
+        end,
+      },
+    },
   }
 end
 
@@ -348,17 +348,17 @@ end
 ---@param number number issue or PR number
 function M.remove_milestone(issue, number)
   local command = issue and "issue" or "pr"
-  local args = { command, "edit", number, "--remove-milestone" }
 
-  gh.run {
-    args = args,
-    cb = function(output, stderr)
-      if stderr and not M.is_blank(stderr) then
-        M.error(stderr)
-      elseif output then
-        M.info "Removed milestone"
-      end
-    end,
+  gh[command].edit {
+    number,
+    remove_milestone = true,
+    opts = {
+      cb = gh.create_callback {
+        success = function(_)
+          M.info "Removed milestone"
+        end,
+      },
+    },
   }
 end
 

diff --git a/lua/tests/plenary/gh_spec.lua b/lua/tests/plenary/gh_spec.lua
@@ -14,6 +14,41 @@ describe("insert_args:", function()
     }
     eq(args, expected)
   end)
+  it("Replace mapping default", function()
+    local args = {}
+    local opts = {
+      remove_label = "Some label",
+    }
+    gh.insert_args(args, opts)
+    local expected = {
+      "--remove_label",
+      "Some label",
+    }
+    eq(args, expected)
+  end)
+  it("Replace mapping underscores", function()
+    local args = {}
+    local opts = {
+      remove_label = "Some label",
+    }
+    gh.insert_args(args, opts, { ["_"] = "-" })
+    local expected = {
+      "--remove-label",
+      "Some label",
+    }
+    eq(args, expected)
+  end)
+  it("Replace mapping underscores boolean", function()
+    local args = {}
+    local opts = {
+      remove_milestone = true,
+    }
+    gh.insert_args(args, opts, { ["_"] = "-" })
+    local expected = {
+      "--remove-milestone",
+    }
+    eq(args, expected)
+  end)
   it("single characters have single hyphen", function()
     local args = {}
     local opts = {