git-maintain 0.14.2 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 14413a6c304673d11dd57a4b5ecec51e2717aff5e77b2b6c7caade9d89a29ed4
-  data.tar.gz: 0e74198aea4155a40790169c51123293aa0811ae41b5f0d17e0a8b81f72bbf1b
+  metadata.gz: f55e7403a58f8a095f7d56a209d420a39bd9e80764aba046a3c5abe01a36e895
+  data.tar.gz: 470418a1906e8e3e75f9f7c0d76ed966f4db5b3484dd4fbcc260373ab5fd5c78
 SHA512:
-  metadata.gz: c8ba35679ef2ea3676be16e59db74bbc3266eed55f4ab73f9d28d923f11d67c058833a3eeb984252d5d089b28485d9a44536729f8db68918c371fe6581bf1667
-  data.tar.gz: ee69deed0ff1ceb20900d252cd74948921847a488aedd01226001be2a82dc3cf248662a4310fe5ca30188d7fb98ed83d108ca37cb6e1e4c26aec7d53cf458daf
+  metadata.gz: f809fb74f7373c31e2cabf787c5aa3ef5e7664cb147662e4fba1bc114f1ef3f96924b0276a52c6a941876093acd590ae42ccb4634d9c23aa88525075a921f450
+  data.tar.gz: 33da4f97cf225aaeed97e09f354f87b3345c492fce43708526f09b4d29254d8eac5f43cac685a52920b2b03cfa19d7284ec6c26dacb7838734982d92ce993fd3

data/CHANGELOG

@@ -1,3 +1,16 @@
+------------------
+1.1.0  (2026-09-18)
+------------------
+
+* Update to cli_class_tool 2.0.0
+* Use new runXXX API
+
+------------------
+1.0.0  (2026-09-09)
+------------------
+
+* Update to cli_class_tool 1.0.0
+
 ------------------
 0.14.2  (2026-09-09)
 ------------------

data/lib/git-maintain/branch.rb

@@ -588,7 +588,7 @@ module GitMaintain
             delete_list = opts[:delete_branches] || []
             return if delete_list.length == 0
             puts "Deleting #{opts[:delete_remote] == true ? "remote" : "local"} branches: #{delete_list.join(" ")}"
-            rep = confirm(opts, "continue", true)
+            rep = confirm(opts, "continue", ignored_default: true)
             if rep != "y" then
                 log(:INFO, "Cancelling")
                 return
@@ -713,7 +713,7 @@ module GitMaintain
         # @raise [CherryPickErrorException] If cherry-picking the commit (and its alternatives) fails
         def pick_one(commit)
             cpCmd="cherry-pick --strategy=recursive -Xpatience -x"
-            runGitInteractive("#{cpCmd} #{commit} &> /dev/null", {}, false)
+            runGitInteractive("#{cpCmd} #{commit} &> /dev/null", catch_err: true)
 	    return if $? == 0
 
             if runGit("status -uno --porcelain | wc -l") == "0" then
@@ -725,7 +725,7 @@ module GitMaintain
 	    # That didn't work? Let's try that with every variation of the commit
 	    # in other stable trees.
             @repo.find_alts(commit).each(){|alt_commit|
-		runGitInteractive("#{cpCmd} #{alt_commit} &> /dev/null", {}, false)
+		runGitInteractive("#{cpCmd} #{alt_commit} &> /dev/null", catch_err: true)
 		if $? == 0 then
 		    return
 		end
@@ -734,7 +734,7 @@ module GitMaintain
 
 	    # Still no? Let's go back to the original commit and hand it off to
 	    # the user.
-	    runGitInteractive("#{cpCmd} #{commit} &> /dev/null", {}, false)
+	    runGitInteractive("#{cpCmd} #{commit} &> /dev/null", catch_err: true)
             raise CherryPickErrorException.new("Failed to cherry pick commit #{commit}", commit)
         end
 
@@ -747,8 +747,11 @@ module GitMaintain
         def cp_fix(opts, commit)
             runGitInteractive("diff")
             log( :INFO, "Entering subshell to fix conflicts. Exit when done")
-            runSystem("PS1_WARNING='CP FIX' bash", false)
-            rep = confirm(opts, "continue with scp [y(es), n(o), s(kip)]?", true, ["y", "n", "s"])
+            runSystem("PS1_WARNING='CP FIX' bash", catch_err: true)
+            rep = confirm(opts, "continue with scp",
+                          ignore_default: true,
+                          allowed_reps: ["y", "n", "s"],
+                          usage: "[y]es, [n]o, [s]kip")
             case rep
             when "n"
                 runGitInteractive("cherry-pick --abort")
@@ -807,8 +810,10 @@ module GitMaintain
 	    commit_desc = @repo.getCommitHeadline(commit)
             rep = "t"
             while rep != "y"
-                rep = confirm(opts, "pick commit '#{commit_desc}' up ([y]es, [n]o, [b]lacklist)",
-                              false, ["y", "n", "?", "b"])
+                rep = confirm(opts, "pick commit '#{commit_desc}' up",
+                              ignore_default: false,
+                              allowed_reps: ["y", "n", "?", "b"],
+                              usage: " ([y]es, [n]o, show[?], [b]lacklist")
 
                 case rep
                 when "y"
@@ -820,7 +825,7 @@ module GitMaintain
 		    add_blacklist(commit)
 		    raise CPSkip.new(commit)
                 when "?"
-                    runGitInteractive("show #{commit}", {}, false)
+                    runGitInteractive("show #{commit}", catch_err: true)
                 end
             end
 

data/lib/git-maintain/repo.rb

@@ -152,7 +152,7 @@ module GitMaintain
         # @return [String] Cached or fetched config value string
         # @raise [RunError] If running git config fails unexpectedly
         def getGitConfig(entry)
-            return @config_cache[entry] ||= runGit("config #{entry} 2> /dev/null", {}, false).chomp()
+            return @config_cache[entry] ||= runGit("config #{entry}", catch_err: true, silent_err: true).chomp()
         end
 
         # Spawn an interactive subshell (bash), wrapping error conditions into a GitMaintainError.
@@ -416,7 +416,8 @@ module GitMaintain
             end
 
             log(:WARNING, "This will officially release these tags: #{new_tags.join(", ")}")
-            rep = confirm(opts, "release them", true)
+            rep = confirm(opts, "release them",
+                          ignore_default: true)
             if rep != 'y' then
                 raise GitMaintainError.new("Aborting..")
             end
@@ -426,7 +427,8 @@ module GitMaintain
             end
 
             log(:WARNING, "Last chance to cancel before submitting")
-            rep= confirm(opts, "submit these releases", true)
+            rep= confirm(opts, "submit these releases",
+                         ignore_default: true)
             if rep != 'y' then
                 raise GitMaintainError.new("Aborting..")
             end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: git-maintain
 version: !ruby/object:Gem::Version
-  version: 0.14.2
+  version: 1.1.0
 platform: ruby
 authors:
 - Nicolas Morey-Chaisemartin
 bindir: bin
 cert_chain: []
-date: 2026-09-09 00:00:00.000000000 Z
+date: 2026-09-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cli_class_tool
@@ -82,7 +82,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 4.0.16
+rubygems_version: 4.0.20
 specification_version: 4
 summary: Your ultimate script for maintaining stable branches and releasing your project.
 test_files: []