git-maintain 0.9.0 → 0.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 868f7d13ca258e469a2a32f892646f22486c006b2dd6cdd927a8df4ee349aaaf
-  data.tar.gz: ee9fabe23d3918015bd195d67ca36d528dba9d993574749134e338143d06429f
+  metadata.gz: e9af927752168031d4518212f7ce2114730068296267e7b390db20dde01c3565
+  data.tar.gz: 3e72669ad23fb312fb6d6cadc96ec0b3d9ab1c57db9ee97032a756ac6bffae71
 SHA512:
-  metadata.gz: 306f260c676c76fc85d2bf87b797e3e8831cdcdd5fb0d847f3d7515e6b68ca35d271dd2348d6b1f850300c22a806be344b8eeeac382e9ed02ab19d3dabe18aab
-  data.tar.gz: c7a5aae40d1ab800006f6bc8aa9674eaced5a9acc5ec92a71e338d85a75e9e19768dce0be894b3a846c7976a5b2df189292c2973d31c86aadf0e9a9fdbd66a4e
+  metadata.gz: 4185735836c059c50a9a76568d678a9a7900fd81a1855c6d3b45edb31245d62e0b877fb1f352e03df94743bef3027c3630be0c9bf57eafb61d82899ed5f58e49
+  data.tar.gz: 966702bfd742eee451afc86ed247e0bca851cbd955b4cbf2cad2a2f7e30dbe815600093d286aef7f78a8e5f311680fa57991b0f15965d97f5881d9b144e66dd8

data/CHANGELOG

@@ -1,3 +1,22 @@
+------------------
+0.11.0  (2025-04-15)
+------------------
+
+* Add github workflow for CI and publishing released rubygems
+
+------------------
+0.10.0  (2025-04-15)
+------------------
+
+* Fix and extend CI
+* Add addons info in general help and repo summary
+* Add ENV var to point to custom addons
+* Addons updates
+* Set PS1_WARNING to help dealing with subshell status
+* Azure fixes
+* Remove list_stable, monitor_stable, push_stable commands. Replace with --stable option of the regular ones
+* Add pull command
+
 ------------------
 0.9.0  (2022-10-18)
 ------------------

data/README.md

@@ -13,12 +13,9 @@ The idea is to script most of the maintenance tasks so the maintainer can focus
 - **delete**: Delete all local branches using the suffix
 - **steal**: Steal commit from upstream that fixes commit in the branch or were tagged as stable
 - **list**: List commit present in the branch but not in the stable branch
-- **list_stable**: List commit present in the stable branch but not in the latest associated relase
 - **merge**: Merge branch with suffix specified in -m <suff> into the main branch
 - **push**: Push branches to github for validation
 - **monitor**: Check the CI state of all branches
-- **push_stable**: Push to stable repo
-- **monitor_stable**: Check the CI state of all stable branches
 - **release**: Create new release on all concerned branches
 - **reset**: Reset branch against upstream
 - **submit_release**: Push the to stable and create the release packages
@@ -167,7 +164,7 @@ Some time later, check their status
 
 If everything looks good, push to the stable repo
 
-```git maintain push_stable --version '1[789]'```
+```git maintain push --stable --version '1[789]'```
 
 If patches have been sent to the ML but are not yet accepted, I usually try them out on a "pending" branch.
 
@@ -225,6 +222,11 @@ To run:
 Once some work has been done, it is time for a new release.
 
 First, unless you're working for the rdma-core repo, you'll need to add your own 'add-on' class to do automatize tyour release process. Please look at 'addons/RDMACore.rb' for an example.
+Addons should be '.rb' file placed either in the same directory as pre-installed addons, or in a directory pointed to by the environment variable GIT_MAINTAIN_ADDON_DIR.
+
+To list available addons, run:
+
+```git maintain -h```
 
 Then all you need to do is create your release(s)
 
@@ -232,16 +234,16 @@ Then all you need to do is create your release(s)
 
 This will run your addon code. What you usually want to do in there is create a tag and eventually bump version numbers, add releases notes, etc.
 
-I strongly advise here to then use the 'push_stable' command. It will update the branches, but NOT push the tag.
+I strongly advise here to then use the 'push --stable' command. It will update the branches, but NOT push the tag.
 This means that if something has been broken by the release commit (if any), there is still time to fix it.
 
 The tag will not have been propagated anywhere else and can be deleted manually.
 
-```git maintain push_stable --version '1[789]'```
+```git maintain push --stable --version '1[789]'```
 
 You can then monitor the status on CI
 
-```git maintain monitor_stable --version '1[789]'```
+```git maintain monitor --stable --version '1[789]'```
 
 
 Once everything is green, it is time to submit your release

data/bin/git-maintain

@@ -23,6 +23,15 @@ actionParser.separator "Possible actions:"
 ACTION_HELPS.each(){|k, x|
     actionParser.separator "\t * " + k.to_s() + ": " + x
 }
+custom_classes = GitMaintain::getCustomClasses()
+if custom_classes.length > 0 then
+actionParser.separator "Custom repo addons available:"
+custom_classes.each(){|k, x|
+    actionParser.separator "\t * " + k.to_s()
+}
+
+end
+
 rest = actionParser.order!(ARGV);
 if rest.length <= 0 then
     STDERR.puts("Error: No action provided")

data/lib/addons/RDMACore.rb

@@ -2,6 +2,10 @@ module GitMaintain
     class RDMACoreBranch < Branch
         REPO_NAME = "rdma-core"
         AZURE_MIN_VERSION = 18
+        ACTION_LIST = Branch::ACTION_LIST + [ :validate ]
+        ACTION_HELP = {
+            :validate => "Validate that branch still builds"
+        }.merge(Branch::ACTION_HELP)
 
         def self.set_opts(action, optsParser, opts)
             opts[:rel_type] = nil
@@ -117,9 +121,18 @@ mv debian/changelog.new debian/changelog")
             end
             `rm -f #{tag_path}`
         end
+        def validate(opts)
+            @repo.runSystem("rm -Rf build/ && mkdir build/ && cd build/ && cmake .. && make -j")
+            raise("Validation failure") if $? != 0
+        end
     end
     class RDMACoreRepo < Repo
         AZURE_MIN_VERSION = 18
+        ACTION_LIST = Repo::ACTION_LIST + [ :create_stable ]
+        ACTION_HELP = {
+            :create_stable => "Create a stable branch from a release tag"
+        }.merge(Repo::ACTION_HELP)
+
         def submitReleases(opts, new_tags)
             new_tags.each(){|tag|
                 next if tag !~ /v([0-9]*)\.[0-9]*/
@@ -128,6 +141,49 @@ mv debian/changelog.new debian/changelog")
                 createRelease(opts, tag, major < AZURE_MIN_VERSION)
             }
         end
+
+        def self.set_opts(action, optsParser, opts)
+            case action
+            when :create_stable then
+                optsParser.on("-V", "--version [NUM]", Integer,
+                              "Specify which version to use to create the stable branch.") {
+                |val| opts[:version] = val}
+                optsParser.on("-S", "--skip",
+                              "Skip docker image generation") {
+                |val| opts[:skip_docker] = true}
+            end
+        end
+        def self.check_opts(opts)
+            case opts[:action]
+                when :create_stable
+                if opts[:version].to_s() == "" then
+                    raise "Action #{opts[:action]} requires a branch number to be specified"
+                end
+                 if opts[:br_suff] != "master" then
+                    raise "Action #{opts[:action]} can only be done on 'master' suffixed branches"
+                end
+           end
+        end
+        def create_stable(opts)
+            ver = opts[:version].to_s()
+            suff = opts[:br_suff]
+            if getBranchList(suff).index(ver) != nil then
+                raise("Local branch already exists for version #{ver}")
+            end
+            br = versionToLocalBranch(ver, suff)
+            full_ver = ver.gsub(/([0-9]+)/, @stable_base_format)
+            runGit("checkout -B #{br} #{full_ver}")
+            cmdList = `awk '/\`\`\`/{p=!p; next};p' Documentation/stable.md`.chomp().split("\n")
+            if opts[:skip_docker] == true then
+                cmdList = cmdList.map(){|x| x if x !~ /build-images/}.compact()
+            end
+            cmdList = cmdList.map(){|x| (x !~ /pkg azp/) ? x : (x + " || true") }.compact()
+            cmdList << "./buildlib/cbuild pkg azp"
+
+            toDo=cmdList.join("&&")
+            runSystem(toDo)
+            raise("Fail to run stable creation code") if $? != 0
+        end
     end
 
     class RDMACoreCI < CI

data/lib/addons/git-maintain.rb

@@ -1,19 +1,47 @@
 module GitMaintain
     class GitMaintainBranch < Branch
         REPO_NAME = "git-maintain"
+        def self.set_opts(action, optsParser, opts)
+            opts[:rel_type] = nil
 
+            case action
+            when :release
+                 optsParser.on("--major [VERSION]", "Release a major version.") {|val|
+                     opts[:rel_type] = :major
+                     opts[:new_ver] = val
+                 }
+                 optsParser.on("--stable", "Release a stable version.") {
+                     opts[:rel_type] = :stable
+                 }
+           end
+        end
+        def self.check_opts(opts)
+            if opts[:action] == :release then
+                case opts[:rel_type]
+                when nil
+                    raise "No release type specified use --stable or --major"
+                when :major
+                    if opts[:manual_branch] == nil then
+                        GitMaintain::log(:INFO, "Major release selected. Auto-forcing branch to master")
+                        opts[:manual_branch] = "master"
+                    end
+                end
+            end
+        end
         def release(opts)
             prev_ver=@repo.runGit("show HEAD:CHANGELOG | grep -A 1 -- '---------'  | head -n 2 | tail -n 1 | awk '{ print $1}'").chomp()
             ver_nums = prev_ver.split(".")
 
-            if opts[:manual_branch] == nil then
+            if opts[:rel_type] == :stable then
                 new_ver =  (ver_nums[0 .. -2] + [ver_nums[-1].to_i() + 1 ]).join(".")
                 git_prev_ver = "v" + (ver_nums[-1] == "0" ? ver_nums[0 .. -2].join(".") : prev_ver)
-            else
+            elsif opts[:rel_type] == :major then
                 new_ver =  (ver_nums[0 .. -3] + [ver_nums[-2].to_i() + 1 ] + [ "0" ]).join(".")
+                new_ver = opts[:new_ver] if opts[:new_ver] != nil
                 git_prev_ver = "v" + prev_ver
             end
 
+
             changes=@repo.runGit("show HEAD:CHANGELOG |  awk ' BEGIN {count=0} {if ($1 == \"------------------\") count++; if (count == 0) print $0}'")
 
             puts "Preparing release #{prev_ver} => #{new_ver}"

data/lib/azure.rb

@@ -13,7 +13,7 @@ module GitMaintain
         def getState(sha1, resp)
             br = findBranch(sha1, resp)
             return "not found" if br == nil
-            return "running" if br["result"] == nil
+            return "started" if br["result"] == nil
             return br["result"].to_s()
         end
         def getLog(sha1, resp)
@@ -34,7 +34,7 @@ module GitMaintain
         def getTS(sha1, resp)
             br = findBranch(sha1, resp)
             raise("Travis build not found") if br == nil
-            return br["started_at"]
+            return br["startTime"]
         end
         def checkState(sha1, resp)
             st = getState(sha1, resp)

data/lib/branch.rb

@@ -10,16 +10,15 @@ module GitMaintain
 
     class Branch
         ACTION_LIST = [
-            :cp, :steal, :list, :list_stable,
-            :merge, :push, :monitor,
-            :push_stable, :monitor_stable,
+            :cp, :steal, :list,
+            :merge, :pull, :push, :monitor,
             :release, :reset, :create, :delete
         ]
         NO_FETCH_ACTIONS = [
             :cp, :merge, :monitor, :release, :delete
         ]
         NO_CHECKOUT_ACTIONS = [
-            :create, :delete, :list, :list_stable, :push, :monitor, :monitor_stable
+            :create, :delete, :list, :push, :monitor
         ]
         ALL_BRANCHES_ACTIONS = [
             :create
@@ -30,12 +29,10 @@ module GitMaintain
             :delete => "Delete all local branches using the suffix",
             :steal => "Steal commit from upstream that fixes commit in the branch or were tagged as stable",
             :list => "List commit present in the branch but not in the stable branch",
-            :list_stable => "List commit present in the stable branch but not in the latest associated relase",
             :merge => "Merge branch with suffix specified in -m <suff> into the main branch",
             :push => "Push branches to github for validation",
+            :pull => "Rebase branches on top of the upstream one",
             :monitor => "Check the CI state of all branches",
-            :push_stable => "Push to stable repo",
-            :monitor_stable => "Check the CI state of all stable branches",
             :release => "Create new release on all concerned branches",
             :reset => "Reset branch against upstream",
         }
@@ -58,6 +55,7 @@ module GitMaintain
             opts[:watch] = false
             opts[:delete_remote] = false
             opts[:no_edit] = false
+            opts[:stable] = false
 
             optsParser.on("-v", "--base-version [MIN_VER]", Integer, "Older release to consider.") {
                 |val| opts[:base_ver] = val}
@@ -84,27 +82,36 @@ module GitMaintain
             when :delete
                 optsParser.on("--remote", "Delete the remote staging branch instead of the local ones.") {
                     |val| opts[:delete_remote] = true}
+            when :list
+                 optsParser.on("--stable", "List unreleased commits in the upstream stable branch.") {
+                     opts[:stable] = true }
             when :merge
                 optsParser.banner += "-m <suffix>"
                 optsParser.on("-m", "--merge [SUFFIX]", "Merge branch with suffix.") {
                     |val| opts[:do_merge] = val}
-            when :monitor, :monitor_stable
+            when :monitor
                 optsParser.on("-w", "--watch <PERIOD>", Integer,
                               "Watch and refresh CI status every <PERIOD>.") {
                     |val| opts[:watch] = val}
+                 optsParser.on("--stable", "Check CI status on stable repo.") {
+                     opts[:stable] = true }
+            when :pull
+                 optsParser.on("--stable", "List unreleased commits in the upstream stable branch.") {
+                     opts[:stable] = true }
             when :push
                 optsParser.banner += "[-f]"
                 optsParser.on("-f", "--force", "Add --force to git push (for 'push' action).") {
-                    |val| opts[:push_force] = val}
-            when :push_stable
+                    opts[:push_force] = true}
+                optsParser.on("--stable", "Push to stable repo.") {
+                     opts[:stable] = true }
                 optsParser.banner += "[-T]"
                 optsParser.on("-T", "--no-ci", "Ignore CI build status and push anyway.") {
-                    |val| opts[:no_ci] = true}
+                    opts[:no_ci] = true}
                 optsParser.on("-c", "--check", "Check if there is something to be pushed.") {
-                    |val| opts[:check_only] = true}
+                    opts[:check_only] = true}
             when :release
-                 optsParser.on("--no-edit", "Do not edit release commit nor tag.") {
-                     opts[:no_edit] = true }
+                optsParser.on("--no-edit", "Do not edit release commit nor tag.") {
+                    opts[:no_edit] = true }
             when :steal
                 optsParser.banner += "[-a][-b <HEAD>]"
                 optsParser.on("-a", "--all", "Check all commits from master. "+
@@ -117,8 +124,7 @@ module GitMaintain
         end
 
         def self.check_opts(opts)
-            if opts[:action] == :push_stable ||
-               opts[:action] == :release then
+               if opts[:action] == :release then
                 if opts[:br_suff] != "master" then
                     raise "Action #{opts[:action]} can only be done on 'master' suffixed branches"
                 end
@@ -128,6 +134,11 @@ module GitMaintain
                     raise "Action #{opts[:action]} can NOT be done on 'master' suffixed branches"
                 end
             end
+            if opts[:action] == :push
+                if opts[:stable] == true && opts[:push_force] == true then
+                    raise "Action push  can NOT be use both --stable and --force"
+                end
+            end
             opts[:version] = [ /.*/ ] if opts[:version].length == 0
         end
 
@@ -214,6 +225,7 @@ module GitMaintain
             end
 
             @head          = @repo.runGit("rev-parse --verify --quiet #{@local_branch}")
+            @valid_ref     = "#{@repo.valid_repo}/#{@local_branch}"
             @remote_ref    = "#{@repo.stable_repo}/#{@remote_branch}"
             @stable_head   = @repo.runGit("rev-parse --verify --quiet #{@remote_ref}")
             case @branch_type
@@ -223,7 +235,7 @@ module GitMaintain
                 @stable_base   = @remote_ref
             end
         end
-        attr_reader :version, :local_branch, :head, :remote_branch, :remote_ref, :stable_head,
+        attr_reader :version, :local_branch, :head, :remote_branch, :valid_ref, :remote_ref, :stable_head,
                     :verbose_name, :exists, :stable_base
 
         def log(lvl, str)
@@ -257,7 +269,7 @@ module GitMaintain
                 @repo.runGitInteractive("cherry-pick #{commit}")
                 if $? != 0 then
                     log(:WARNING, "Cherry pick failure. Starting bash for manual fixes. Exit shell to continue")
-			        @repo.runBash()
+			        @repo.runBash("PS1_WARNING='CP FIX'")
 		        end
                 new_head=@repo.runGit("rev-parse HEAD")
                 # Do not make commit pretty if it was not applied
@@ -305,16 +317,15 @@ module GitMaintain
             end
         end
 
-        # List commits in the branch that are no in the stable branch
         def list(opts)
             GitMaintain::log(:INFO, "Working on #{@verbose_name}")
-            GitMaintain::showLog(opts, @local_branch, @remote_ref)
-        end
-
-        # List commits in the stable_branch that are no in the latest release
-        def list_stable(opts)
-            GitMaintain::log(:INFO, "Working on #{@verbose_name}")
-            GitMaintain::showLog(opts, @remote_ref, @repo.runGit("describe --abbrev=0 #{@local_branch}"))
+            if opts[:stable] == true then
+                # List commits in the stable_branch that are no in the latest release
+                GitMaintain::showLog(opts, @remote_ref, @repo.runGit("describe --abbrev=0 #{@local_branch}"))
+            else
+                # List commits in the branch that are no in the stable branch
+                GitMaintain::showLog(opts, @local_branch, @remote_ref)
+            end
         end
 
         # Merge merge_branch into this one
@@ -340,7 +351,7 @@ module GitMaintain
                 @repo.runGitInteractive("merge #{merge_branch}")
                 if $? != 0 then
                     log(:WARNING, "Merge failure. Starting bash for manual fixes. Exit shell to continue")
-			        @repo.runBash()
+			        @repo.runBash("PS1_WARNING='MERGING'")
 		        end
             else
                 log(:INFO, "Skipping merge")
@@ -348,14 +359,55 @@ module GitMaintain
             end 
         end
 
+        def pull(opts)
+            remoteRef = opts[:stable] == true ? @remote_ref : @valid_ref
+
+            # Make sure branch exists
+            @repo.runGit("rev-parse --verify --quiet #{remoteRef}")
+            if $? != 0 then
+                log(:INFO, "Branch #{remoteRef} does not exists. Skipping...")
+                return
+            end
+            @repo.runGitInteractive("rebase #{remoteRef}")
+
+        end
         # Push the branch to the validation repo
         def push(opts)
-            if same_sha?(@local_branch, @repo.valid_repo + "/" + @local_branch) ||
+            remoteRef = opts[:stable] == true ? @remote_ref : @valid_ref
+
+            # Check both where we want to push and the final remote_ref
+            # We may have destroyed the validation branch but if we already merged
+            # in the final repo, no need to worry about it.
+            if same_sha?(@local_branch, remoteRef) ||
                same_sha?(@local_branch, @remote_ref) then
                 log(:INFO, "Nothing to push on #{@local_branch}")
                 return
             end
-            return "#{@local_branch}:#{@local_branch}"
+
+            # For stable branches, we need to check for CI
+            if opts[:stable] == true &&
+               (opts[:no_ci] != true && @NO_CI != true) &&
+               @ci.checkValidState(self, @head) != true then
+                log(:WARNING, "Build is not passed on CI. Skipping push to stable")
+                return
+            end
+
+            if opts[:check_only] == true then
+                GitMaintain::checkLog(opts, @local_branch, @remote_ref, "")
+                return
+            end
+
+            # For validation/CI push, let's go and push already
+            return "#{@local_branch}:#{@local_branch}" if opts[:stable] != true
+
+            # For stable, we need to confirm with the user that he really wants to push
+            rep = GitMaintain::checkLog(opts, @local_branch, @remote_ref, "submit")
+            if rep == "y" then
+                return "#{@local_branch}:#{@remote_branch}"
+            else
+                log(:INFO, "Skipping push to stable")
+                return
+            end
         end
 
         def self.push_epilogue(opts, branches)
@@ -364,17 +416,26 @@ module GitMaintain
 
             return if branches.length == 0
 
+            repo = (opts[:stable] == true) ? opts[:repo].stable_repo : opts[:repo].valid_repo
             opts[:repo].runGit("push #{opts[:push_force] == true ? "-f" : ""} "+
-                               "#{opts[:repo].valid_repo} #{branches.join(" ")}")
+                               "#{repo} #{branches.join(" ")}")
         end
 
         # Monitor the build status on CI
         def monitor(opts)
-            st = @ci.getValidState(self, @head)
+            ts = st = head = nil
             suff=""
+            if opts[:stable] == true then
+                st = @ci.getStableState(self, @stable_head)
+                ts = @ci.getStableTS(self, @stable_head) if st == "started"
+            else
+                st = @ci.getValidState(self, @head)
+                ts = @ci.getValidTS(self, @head) if st == "started"
+            end
+
             case st
             when "started"
-                suff= " started at #{@ci.getValidTS(self, @head)}"
+                suff= " at #{ts}"
             end
             log(:INFO, "Status for v#{@version}: " + st + suff)
             if @ci.isErrored(self, st) && opts[:watch] == false
@@ -396,52 +457,6 @@ module GitMaintain
             end
         end
 
-        # Push branch to the stable repo
-        def push_stable(opts)
-            if same_sha?(@local_branch, @remote_ref) then
-                log(:INFO, "Stable is already up-to-date")
-                return
-            end
-
-            if (opts[:no_ci] != true && @NO_CI != true) &&
-               @ci.checkValidState(self, @head) != true then
-                log(:WARNING, "Build is not passed on CI. Skipping push to stable")
-                return
-            end
-
-            if opts[:check_only] == true then
-                GitMaintain::checkLog(opts, @local_branch, @remote_ref, "")
-                return
-            end
-
-            rep = GitMaintain::checkLog(opts, @local_branch, @remote_ref, "submit")
-            if rep == "y" then
-                return "#{@local_branch}:#{@remote_branch}"
-            else
-                log(:INFO, "Skipping push to stable")
-                return
-            end
-        end
-
-
-        def self.push_stable_epilogue(opts, branches)
-            # Compact to remove empty entries
-            branches.compact!()
-
-            return if branches.length == 0
-            opts[:repo].runGit("push #{opts[:repo].stable_repo} #{branches.join(" ")}")
-        end
-         # Monitor the build status of the stable branch on CI
-        def monitor_stable(opts)
-            st = @ci.getStableState(self, @stable_head)
-            suff=""
-            case st
-            when "started"
-                suff= " started at #{@ci.getStableTS(self, @stable_head)}"
-            end
-            log(:INFO, "Status for v#{@version}: " + st + suff)
-        end
-
         # Reset the branch to the upstream stable one
         def reset(opts)
             if same_sha?(@local_branch, @remote_ref) then
@@ -709,7 +724,7 @@ module GitMaintain
 		        pick_one(commit)
             rescue CherryPickErrorException => e
 			    log(:WARNING, "Cherry pick failed. Fix, commit (or reset) and exit.")
-			    @repo.runSystem("/bin/bash")
+			    @repo.runBash("PS1_WARNING='CP FIX'")
             end
             new_head=@repo.runGit("rev-parse HEAD")
 
@@ -719,7 +734,7 @@ module GitMaintain
 			    msg="Custom"
 			    orig_cmt=@repo.runGit("rev-parse HEAD")
 			    log(:WARNING, "Custom commit, please double-check!")
-			    @repo.runSystem("/bin/bash")
+			    @repo.runBash("PS1_WARNING='CHECK'")
 		    end
             if new_head != prev_head
 		        make_pretty(orig_cmt, msg)

data/lib/common.rb

@@ -57,6 +57,7 @@ module GitMaintain
 
     def registerCustom(repo_name, classes)
         raise("Multiple class for repo #{repo_name}") if @@custom_classes[repo_name] != nil
+        classes[:name] = repo_name if classes[:name] == nil
         @@custom_classes[repo_name] = classes
     end
     module_function :registerCustom
@@ -73,6 +74,11 @@ module GitMaintain
     end
     module_function :getClass
 
+    def getCustomClasses()
+        return @@custom_classes
+    end
+    module_function :getCustomClasses
+
     def loadClass(default_class, repo_name, *more)
         @@load_class.push(default_class)
         obj = GitMaintain::getClass(default_class, repo_name).new(*more)
@@ -95,49 +101,64 @@ module GitMaintain
 
     def getActionAttr(attr)
         if Common.const_get(attr).class == Hash
-            return ACTION_CLASS.inject({}){|h, x| h.merge(x.const_get(attr))}
+            return ACTION_CLASS.inject({}){|h, x| h.merge(getClass(x).const_get(attr))}
         else
-            return ACTION_CLASS.map(){|x| x.const_get(attr)}.flatten()
+            return ACTION_CLASS.map(){|x| getClass(x).const_get(attr)}.flatten()
         end
     end
     module_function :getActionAttr
 
     def setOpts(action, optsParser, opts)
          ACTION_CLASS.each(){|x|
-            next if x::ACTION_LIST.index(action) == nil
-            if x.singleton_methods().index(:set_opts) != nil then
+            if x::ACTION_LIST.index(action) != nil &&
+               x.singleton_methods().index(:set_opts) != nil then
+                matched=true
                 x.set_opts(action, optsParser, opts)
             end
             # Try to add repo specific opts
             y = getClass(x)
-            if x != y && y.singleton_methods().index(:set_opts) != nil then
+            if x != y && y::ACTION_LIST.index(action) != nil &&
+               y.singleton_methods().index(:set_opts) != nil then
+                matched=true
+                x.set_opts(action, optsParser, opts) if x.singleton_methods().index(:set_opts) != nil
                 y.set_opts(action, optsParser, opts)
             end
-            break
+            break if matched == true
         }
     end
     module_function :setOpts
 
     def checkOpts(opts)
         ACTION_CLASS.each(){|x|
-            next if x::ACTION_LIST.index(opts[:action]) == nil
-            next if x.singleton_methods().index(:check_opts) == nil
-            x.check_opts(opts)
+            if x::ACTION_LIST.index(opts[:action]) != nil &&
+               x.singleton_methods().index(:check_opts) != nil then
+                matched=true
+                x.check_opts(opts)
+            end
 
             # Try to add repo specific opts
             y = getClass(x)
-            if x != y && y.singleton_methods().index(:check_opts) != nil then
+            if x != y && y::ACTION_LIST.index(opts[:action]) != nil &&
+               y.singleton_methods().index(:check_opts) != nil then
+                matched=true
+                x.check_opts(opts) if x.singleton_methods().index(:check_opts) != nil
                 y.check_opts(opts)
             end
-        }
+            break if matched == true
+       }
     end
     module_function :checkOpts
 
     def execAction(opts, action)
         ACTION_CLASS.each(){|x|
-            next if x::ACTION_LIST.index(action) == nil
-            x.execAction(opts, action)
-            break
+            if x::ACTION_LIST.index(action) != nil
+                return x.execAction(opts, action)
+            end
+           # Try to add repo specific opts
+            y = getClass(x)
+            if x != y && y::ACTION_LIST.index(opts[:action]) != nil then
+                return y.execAction(opts, action)
+            end
         }
     end
     module_function :execAction
@@ -217,3 +238,16 @@ Dir.entries(BACKPORT_LIB_DIR + "/addons/").each(){|entry|
     require entry.sub(/.rb$/, "")
 }
 $LOAD_PATH.pop()
+
+if ENV["GIT_MAINTAIN_ADDON_DIR"].to_s() != "" then
+    ADDON_DIR=ENV["GIT_MAINTAIN_ADDON_DIR"].to_s()
+    if Dir.exists?(ADDON_DIR) then
+        $LOAD_PATH.push(ADDON_DIR)
+        Dir.entries(ADDON_DIR).each(){|entry|
+            next if (!File.file?(ADDON_DIR + "/" + entry) || entry !~ /\.rb$/ );
+            require entry.sub(/.rb$/, "")
+        }
+        $LOAD_PATH.pop()
+    end
+end
+

data/lib/repo.rb

@@ -141,8 +141,8 @@ module GitMaintain
             return @config_cache[entry] ||= runGit("config #{entry} 2> /dev/null").chomp()
         end
 
-        def runBash()
-            runSystem("bash")
+        def runBash(env="")
+            runSystem(env + " bash")
             if $? == 0 then
                 log(:INFO, "Continuing...")
             else
@@ -334,6 +334,9 @@ module GitMaintain
         end
         def summary(opts)
              log(:INFO, "Configuration summary:")
+             if self.class != GitMaintain::Repo then
+                 log(:INFO, "Using custom repo class: #{self.class.to_s()}")
+             end
              log(:INFO, "Stable remote: #{@stable_repo}")
              log(:INFO, "Validation remote: #{@valid_repo}")
              log(:INFO, "")

metadata

@@ -1,35 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: git-maintain
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 0.11.0
 platform: ruby
 authors:
 - Nicolas Morey-Chaisemartin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-10-18 00:00:00.000000000 Z
+date: 2025-04-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: octokit
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '5'
+        version: '5.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '3.0'
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '5'
+        version: '5.0'
 description: |-
   Be lazy and let git-maintain do all the heavy lifting for maintaining stable branches.
   Leaves you only with the essential: reviewing the selected patches and decide where they should go.
@@ -71,7 +65,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.8
+rubygems_version: 3.2.33
 signing_key: 
 specification_version: 4
 summary: Your ultimate script for maintaining stable branches and releasing your project.