git-maintain 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e75c0d819dd93d2a04da7557818ab2384aa193938c10968ab5956860da1a927a
-  data.tar.gz: abb92e652de1c72b0d6934d2264f0bd9f4552e34b3402abb0becec6aee36fa0b
+  metadata.gz: f55e7403a58f8a095f7d56a209d420a39bd9e80764aba046a3c5abe01a36e895
+  data.tar.gz: 470418a1906e8e3e75f9f7c0d76ed966f4db5b3484dd4fbcc260373ab5fd5c78
 SHA512:
-  metadata.gz: 2ff31ac0ed8c09dc538efcd90f5509cae94b8ae7c606bc46c39146abf6d5754b63d99a8f83fe8605bab5a22ce9735a3d357935e02afd0461fabaf03f1c7d5fcf
-  data.tar.gz: 546ac7c74275d81c877b0e22e9acdc926ff915d2a148300fb3b6d7a8398f5f2d3f35865fb3348048b57dbdaf0e2c4dcedcebe2a7435bb1a32cd77e565a84e46f
+  metadata.gz: f809fb74f7373c31e2cabf787c5aa3ef5e7664cb147662e4fba1bc114f1ef3f96924b0276a52c6a941876093acd590ae42ccb4634d9c23aa88525075a921f450
+  data.tar.gz: 33da4f97cf225aaeed97e09f354f87b3345c492fce43708526f09b4d29254d8eac5f43cac685a52920b2b03cfa19d7284ec6c26dacb7838734982d92ce993fd3

data/CHANGELOG

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

data/lib/git-maintain/branch.rb

@@ -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,7 +747,7 @@ 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)
+            runSystem("PS1_WARNING='CP FIX' bash", catch_err: true)
             rep = confirm(opts, "continue with scp",
                           ignore_default: true,
                           allowed_reps: ["y", "n", "s"],
@@ -825,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.

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: git-maintain
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  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: []