git-maintain 0.11.0 → 0.13.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e9af927752168031d4518212f7ce2114730068296267e7b390db20dde01c3565
-  data.tar.gz: 3e72669ad23fb312fb6d6cadc96ec0b3d9ab1c57db9ee97032a756ac6bffae71
+  metadata.gz: 5be1a3c87bfe24c13824a78a03caf5a3b93f8a13653c8befdadde867b4db6cd2
+  data.tar.gz: 85f3b0d06e05db436012d69e058b30d1121ce0b0458cabc1d014f0ab6e6fdfe7
 SHA512:
-  metadata.gz: 4185735836c059c50a9a76568d678a9a7900fd81a1855c6d3b45edb31245d62e0b877fb1f352e03df94743bef3027c3630be0c9bf57eafb61d82899ed5f58e49
-  data.tar.gz: 966702bfd742eee451afc86ed247e0bca851cbd955b4cbf2cad2a2f7e30dbe815600093d286aef7f78a8e5f311680fa57991b0f15965d97f5881d9b144e66dd8
+  metadata.gz: 98db4aba9ccd5891fe62cf00abde4e6dfa9a34132c3494043cb2b3fa18c32d4f5d387807e0914faca6bef657b5e61fe4bd55310144df6e9c8582877abcf18155
+  data.tar.gz: 15ae0262936ddf8f83191854c32eff8a732543ac028f26dd82fd5ccb1565a28ae9c6258cdea28634c83cac38d654766ecb1a8886ace6812326dbe37dd538a664

data/CHANGELOG

@@ -1,3 +1,24 @@
+------------------
+0.13.0  (2026-09-09)
+------------------
+
+* Major internal refactor
+  * CLI code has been moded to cli_class_tool
+  * Replace all return values by exceptions
+  * Cleanup path handling
+  * Simplify Branch class by introducing a BranchIterator
+  * In theory, fully transparent for end-users
+
+------------------
+0.12.0  (2025-09-11)
+------------------
+
+* Cleanup code for Addons releases
+* Replace all egrep calls with grep -E
+* Replace $? handling with Exceptions
+* Various minor fixes
+* Drop obsolete Travis CI code
+
 ------------------
 0.11.0  (2025-04-15)
 ------------------

data/README.md

@@ -27,10 +27,10 @@ The idea is to script most of the maintenance tasks so the maintainer can focus
 - Load git-maintain-completion.sh for shell completion
 
 ## Remote setup
-- the 'github' remote should be your own WIP github to test out branches before submitting to the official repo.  
+- the 'github' remote should be your own WIP github to test out branches before submitting to the official repo.
   Also know as the 'Validation' repo. It can be switched to another remote by setting maintain.valid-repo=xxx in your gitconfig
 - the 'origin' remote should be the official repo in read-only mode to avoid any accidental pushes
-- the 'stable' remote should be the official repo in RW mode.  
+- the 'stable' remote should be the official repo in RW mode.
   Also know as the 'Stable' repo. It can be switched to another remote by setting maintain.stable-repo=xxx in your gitconfig
 
 ## Stealing commits
@@ -38,10 +38,10 @@ The idea is to script most of the maintenance tasks so the maintainer can focus
 The steal feature uses was shamelessly copied it from https://git.kernel.org/pub/scm/linux/kernel/git/sashal/stable-tools.git/tree/
 
 ## Making releases
-The release process being very specific to each project, the release command does nothing by default.  
+The release process being very specific to each project, the release command does nothing by default.
 However the behaviour can be overriden for specific repo (detected by repo name)
 
-Check the lib/addons/RDMACore.rb for an example.  
+Check the lib/addons/RDMACore.rb for an example.
 In this case, the release command bump the version in all the appropriate files (after computing the previous and next version numbers), commit and tags the commit.
 
 
@@ -122,12 +122,12 @@ $ git maintain summary
 # INFO: Configuration summary:
 # INFO: Stable remote: stable
 # INFO: Validation remote: github
-# INFO: 
+# INFO:
 # INFO: Branch config:
 # INFO: Local branch format: /dev\/stable-v([0-9]*)/
 # INFO: Remote stable branch format: stable-v\1
 # INFO: Remote stable base format: v\1
-# INFO: 
+# INFO:
 # INFO: Local branches:
 # INFO: dev/stable-v15/master -> stable/stable-v15
 # INFO: dev/stable-v16/master -> stable/stable-v16
@@ -137,7 +137,7 @@ $ git maintain summary
 # INFO: dev/stable-v20/master -> stable/stable-v20
 # INFO: dev/stable-v21/master -> stable/stable-v21
 # INFO: dev/stable-v22/master -> stable/stable-v22
-# INFO: 
+# INFO:
 # INFO: Upstream branches:
 # INFO: <MISSING> -> stable/stable-v23
 ```
@@ -262,16 +262,16 @@ This is a summary of all the settings that can be set in the git config:
 
 - `maintain.valid-repo`: Remote github repo to test out branches before submitting. Default = `github`
 - `maintain.stable-repo`: Remote stable github repository t submit validated branches and new releases. Default = `stable`
-- `maintain.autofetch`: Enable/Disable auto fetching.  
-   Can be overriden by the --[no-]fetch option on the CLI.  
+- `maintain.autofetch`: Enable/Disable auto fetching.
+   Can be overriden by the --[no-]fetch option on the CLI.
    If unset, autofetch is enabled
-- `maintain.branch-format`: Local branch name space that also extracts the version.  
+- `maintain.branch-format`: Local branch name space that also extracts the version.
    Example: dev\/stable-v([0-9]*) will allow all branch names dev/stable-vXXX/foo to be used against stable branch with version XXX
-- `maintain.stable-branch-format`: Name of the stable branch generated with the version extracted by the `maintain.branch-format` regexp.  
+- `maintain.stable-branch-format`: Name of the stable branch generated with the version extracted by the `maintain.branch-format` regexp.
    Example: stable-v\1 will track dev/stable-vXXX/foo against <STABLE_REPO>/stable-vXXX
-- `maintain.stable-base-format`: Name of the tag from which the stable branch was forked from generated with the version extracted by the `maintain.branch-format` regexp.  
-   Example: v\1 will be mark vXXX has the fork tag for branch <STABLE_REPO>/stable-vXXX and local branch dev/stable-vXXX/foo  
-   This settings is only needed when using `git maintain steal` command  
+- `maintain.stable-base-format`: Name of the tag from which the stable branch was forked from generated with the version extracted by the `maintain.branch-format` regexp.
+   Example: v\1 will be mark vXXX has the fork tag for branch <STABLE_REPO>/stable-vXXX and local branch dev/stable-vXXX/foo
+   This settings is only needed when using `git maintain steal` command
    This rule can be overriden by a specific entry in gitconfig:
    `stable-base.dev---stable-vXXX vYY-ZZ`
    As git does not allow `/` in gitconfig they are to be replaced by `---`

data/bin/git-maintain

@@ -4,66 +4,18 @@ require 'optparse'
 require 'net/http'
 require 'json'
 
-BACKPORT_LIB_DIR = File.dirname(__FILE__) + '/../lib'
-$LOAD_PATH.push(BACKPORT_LIB_DIR)
-require 'common'
+GIT_MAINTAIN_LIB_DIR = File.expand_path('../lib', __dir__)
+$LOAD_PATH.push(GIT_MAINTAIN_LIB_DIR)
+require 'git-maintain'
 $LOAD_PATH.pop()
 
 opts = {
     :br_suff => "master",
     :yn_default => nil,
 }
-ACTION_HELPS = GitMaintain::getActionAttr("ACTION_HELP")
-actionParser = OptionParser.new(nil, 60)
-actionParser.banner = "Usage: #{__FILE__} <action> [action options]"
-actionParser.separator ""
-actionParser.separator "Options:"
-actionParser.on("-h", "--help", "Display usage.") { |val| puts actionParser.to_s; exit 0 }
-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()
-}
 
+GitMaintain.run_cli(opts) do |parser, phase, action_opts|
+    if phase == :action
+        parser.on("-b", "--branch-suffix [SUFFIX]", "Branch suffix. Default is 'master'.") { |val| action_opts[:br_suff] = val }
+    end
 end
-
-rest = actionParser.order!(ARGV);
-if rest.length <= 0 then
-    STDERR.puts("Error: No action provided")
-    puts actionParser.to_s()
-    exit 1
-end
-
-action_s = ARGV[0]
-action = action_s.to_sym()
-raise("Invalid action '#{action_s}'") if GitMaintain::getActionAttr("ACTION_LIST").index(action) == nil
-opts[:action] = action
-ARGV.shift()
-
-optsParser = OptionParser.new(nil, 60)
-optsParser.banner = "Usage: #{__FILE__} #{action_s} "
-optsParser.separator "# " + ACTION_HELPS[action].to_s()
-optsParser.separator ""
-optsParser.separator "Options:"
-optsParser.on("-h", "--help", "Display usage.") { |val| puts optsParser.to_s; exit 0 }
-optsParser.on("-b", "--branch-suffix [SUFFIX]", "Branch suffix. Default is 'master'.") {
-    |val| opts[:br_suff] = val}
-optsParser.on("-n", "--no", "Assume no to all questions.") {
-    |val| opts[:yn_default] = :no}
-optsParser.on("-y", "--yes", "Assume yes to all questions.") {
-    |val| opts[:yn_default] = :yes}
-optsParser.on("--verbose", "Displays more informations.") {
-    |val| GitMaintain::setVerbose(true)}
-GitMaintain::setOpts(action, optsParser, opts)
-
-rest = optsParser.order!(ARGV);
-raise("Extra Unexpected extra arguments provided: " + rest.map(){|x|"'" + x + "'"}.join(", ")) if rest.length != 0
-
-GitMaintain::checkOpts(opts)
-GitMaintain::execAction(opts, opts[:action])
-

data/git-maintain-completion.sh

@@ -1,13 +1,13 @@
 export _GIT_MAINTAIN_CMD_AWK=$(([ -f /bin/awk ] && echo "/bin/awk") || echo "/usr/bin/awk")
 export _GIT_MAINTAIN_CMD_SORT=$(([ -f /bin/sort ] && echo "/bin/sort") || echo "/usr/bin/sort")
-export _GIT_MAINTAIN_CMD_EGREP=$(([ -f /bin/egrep ] && echo "/bin/egrep") || echo "/usr/bin/egrep")
+export _GIT_MAINTAIN_CMD_GREP=$(([ -f /bin/grep ] && echo "/bin/grep") || echo "/usr/bin/grep")
 export _GIT_MAINTAIN_CMD_SED=$(([ -f /bin/sed ] && echo "/bin/sed") || echo "/usr/bin/sed")
 
 _git_maintain_genoptlist(){
 	local COMMAND=$*
 	${COMMAND}  --help 2>&1 | \
 		${_GIT_MAINTAIN_CMD_AWK} 'BEGIN { found = 0 } { if(found == 1) print $$0; if($$1 == "Options:") {found = 1}}' | \
-		${_GIT_MAINTAIN_CMD_EGREP} -e "^[[:space:]]*--" -e "^[[:space:]]*-[a-zA-Z0-9]" | \
+		${_GIT_MAINTAIN_CMD_GREP} -E -e "^[[:space:]]*--" -e "^[[:space:]]*-[a-zA-Z0-9]" | \
 		${_GIT_MAINTAIN_CMD_SED} -e 's/^[[:space:]]*//' -e 's/^-[^-], //' | \
 		${_GIT_MAINTAIN_CMD_AWK} '{ print $1}' | \
 		${_GIT_MAINTAIN_CMD_SED} -e 's/^\(.*\)\[no-\]\(.*$\)/\1\2\n\1no-\2/' | \
@@ -34,7 +34,7 @@ _git_maintain_cp()
    local OPT_LIST=$(_git_maintain_genoptlist git maintain cp)
 
     case "$prev" in
-		-c|--sha1);;
+		-c|--sha1|--breaker);;
 		*)
 			__gitcomp_nl "$OPT_LIST"
 	        _complete_git_maintain_branch

data/lib/{addons → git-maintain/addons}/RDMACore.rb

@@ -1,12 +1,24 @@
+# Module containing addon classes for rdma-core repository.
 module GitMaintain
+
+    # Subclass of Branch customized for the rdma-core repository.
     class RDMACoreBranch < Branch
+        # The name of this repository.
         REPO_NAME = "rdma-core"
+        # Minimum version number supported by Azure CI.
         AZURE_MIN_VERSION = 18
+        # Addon action list for rdma-core branch.
         ACTION_LIST = Branch::ACTION_LIST + [ :validate ]
+        # Help descriptions of addon actions for CLI.
         ACTION_HELP = {
             :validate => "Validate that branch still builds"
         }.merge(Branch::ACTION_HELP)
 
+        # Configure release-specific command line options.
+        #
+        # @param action [Symbol] Selected action name
+        # @param optsParser [OptionParser] The OptionParser instance
+        # @param opts [Hash] The options hash to populate
         def self.set_opts(action, optsParser, opts)
             opts[:rel_type] = nil
 
@@ -16,13 +28,18 @@ module GitMaintain
                      opts[:rel_type] = :major }
                  optsParser.on("--stable", "Release a stable version.") {
                      opts[:rel_type] = :stable }
-           end
+            end
         end
+
+        # Validate release-specific command line options.
+        #
+        # @param opts [Hash] Options hash to validate
+        # @raise [GitMaintainError] If rel_type is not specified
         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"
+                    raise GitMaintainError.new("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")
@@ -31,8 +48,14 @@ module GitMaintain
                 end
             end
         end
+
+        # Create a new release for rdma-core.
+        # Updates spec files, CMakeLists, changelog, commits, and tags the release.
+        #
+        # @param opts [Hash] Options hash
+        # @raise [GitMaintainError] If prepping, committing, or tagging fails
         def release(opts)
-            prev_ver=@repo.runGit("show HEAD:CMakeLists.txt  | egrep \"[sS][eE][tT]\\\\(PACKAGE_VERSION\"").
+            prev_ver=@repo.runGit("show HEAD:CMakeLists.txt  | grep -E \"[sS][eE][tT]\\\\(PACKAGE_VERSION\"").
                          chomp().gsub(/[sS][eE][tT]\(PACKAGE_VERSION\s*"([0-9.]*)".*$/, '\1')
             ver_nums = prev_ver.split(".")
             new_ver =  (ver_nums[0 .. -2] + [ver_nums[-1].to_i() + 1 ]).join(".")
@@ -49,14 +72,15 @@ module GitMaintain
 
             git_prev_ver = "v" + prev_ver
             # Older tags might do have the terminal minor version (.0) for major releases
-            @repo.runGit("rev-parse --verify --quiet #{git_prev_ver}")
-            if $? != 0 then
+            begin
+                @repo.ref_exist?(git_prev_ver)
+            rescue NoRefError
                 # Try without the minor version number
                 git_prev_ver = "v" + ver_nums[0 .. -2].join(".")
             end
 
             puts "Preparing #{opts[:rel_type].to_s} release #{prev_ver} => #{rel_ver}"
-            rep = GitMaintain::checkLog(opts, @local_branch, git_prev_ver, "release")
+            rep = checkLog(opts, @local_branch, git_prev_ver, "release")
             if rep != "y" then
                 puts "Skipping release"
                 return
@@ -75,15 +99,9 @@ module GitMaintain
             tag_file.puts `git log HEAD ^#{git_prev_ver} --no-merges --format='   * %s'`
             tag_file.close()
 
-            edit_flag = ""
-            edit_flag = "--edit" if opts[:no_edit] == false
-
             if opts[:rel_type] == :major
                 # For major, tag the current version first
-                @repo.runGitInteractive("tag -a -s v#{rel_ver} #{edit_flag} -F #{tag_path}")
-                if $? != 0 then
-                    raise("Failed to tag branch #{local_branch}")
-                end
+                release_do_tag(opts, "v" + rel_ver, tag_path)
             end
 
             # Update version number in relevant files
@@ -107,32 +125,44 @@ mv debian/changelog.new debian/changelog")
             end
 
             # Add and commit
-            @repo.runGit("add  */*.spec CMakeLists.txt debian/changelog")
-            @repo.runGitInteractive("commit -m '#{commit_msg} #{new_ver}' --verbose #{edit_flag} --signoff")
-            if $? != 0 then
-                raise("Failed to commit on branch #{local_branch}")
-            end
+            release_do_add_commit(opts, [ "*/*.spec", "CMakeLists.txt", "debian/changelog" ],
+                                  nil, "#{commit_msg} #{new_ver}")
 
             if opts[:rel_type] == :stable
-                @repo.runGitInteractive("tag -a -s v#{rel_ver} #{edit_flag} -F #{tag_path}")
-                if $? != 0 then
-                    raise("Failed to tag branch #{local_branch}")
-                end
+                release_do_tag(opts, "v" + rel_ver, tag_path)
             end
             `rm -f #{tag_path}`
         end
+
+        # Validate that the branch compiles successfully by building it.
+        #
+        # @param opts [Hash] Options hash
+        # @raise [GitMaintainError] If building the branch fails
         def validate(opts)
-            @repo.runSystem("rm -Rf build/ && mkdir build/ && cd build/ && cmake .. && make -j")
-            raise("Validation failure") if $? != 0
+            begin
+                @repo.runSystem("rm -Rf build/ && mkdir build/ && cd build/ && cmake .. && make -j")
+            rescue RunError
+                raise GitMaintainError.new("Validation failure")
+            end
         end
     end
+    # Repo class customized for the rdma-core repository.
     class RDMACoreRepo < Repo
+        # Minimum version number supported by Azure CI.
         AZURE_MIN_VERSION = 18
+        # Addon action list for rdma-core repo.
         ACTION_LIST = Repo::ACTION_LIST + [ :create_stable ]
+        # Help descriptions of addon actions for CLI.
         ACTION_HELP = {
             :create_stable => "Create a stable branch from a release tag"
         }.merge(Repo::ACTION_HELP)
 
+        # Submit release tags, conditionally creating GitHub releases depending on the version.
+        # Starting from v27, the GitHub release is created automatically by Azure pipelines.
+        #
+        # @param opts [Hash] Options hash
+        # @param new_tags [Array<String>] List of release tags to submit
+        # @raise [GitMaintainError] If release submission fails
         def submitReleases(opts, new_tags)
             new_tags.each(){|tag|
                 next if tag !~ /v([0-9]*)\.[0-9]*/
@@ -142,6 +172,11 @@ mv debian/changelog.new debian/changelog")
             }
         end
 
+        # Configure options for the create_stable action.
+        #
+        # @param action [Symbol] Action name
+        # @param optsParser [OptionParser] The OptionParser instance
+        # @param opts [Hash] The options hash to populate
         def self.set_opts(action, optsParser, opts)
             case action
             when :create_stable then
@@ -153,22 +188,34 @@ mv debian/changelog.new debian/changelog")
                 |val| opts[:skip_docker] = true}
             end
         end
+
+        # Validate options for repo actions.
+        #
+        # @param opts [Hash] Options hash to validate
+        # @raise [MissingArgumentError] If create_stable is called without a version
+        # @raise [GitMaintainError] If create_stable is called on a non-master suffixed branch
         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"
+                    raise MissingArgumentError.new("branch number")
                 end
-                 if opts[:br_suff] != "master" then
-                    raise "Action #{opts[:action]} can only be done on 'master' suffixed branches"
+                if opts[:br_suff] != "master" then
+                    raise GitMaintainError.new("Action #{opts[:action]} can only be done on 'master' suffixed branches")
                 end
-           end
+            end
         end
+
+        # Create a stable branch from a release tag.
+        # Runs the setup commands documented in Documentation/stable.md.
+        #
+        # @param opts [Hash] Options hash
+        # @raise [GitMaintainError] If running stable creation commands fails
         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}")
+                raise GitMaintainError.new("Local branch already exists for version #{ver}")
             end
             br = versionToLocalBranch(ver, suff)
             full_ver = ver.gsub(/([0-9]+)/, @stable_base_format)
@@ -181,13 +228,23 @@ mv debian/changelog.new debian/changelog")
             cmdList << "./buildlib/cbuild pkg azp"
 
             toDo=cmdList.join("&&")
-            runSystem(toDo)
-            raise("Fail to run stable creation code") if $? != 0
+            begin
+                runSystem(toDo)
+            rescue RunError
+                raise GitMaintainError.new("Fail to run stable creation code")
+            end
         end
     end
 
+    # CI interface subclass customized to route CI queries for rdma-core.
+    # Uses Travis for older versions (< 18) and Azure DevOps for newer versions.
     class RDMACoreCI < CI
+        # Minimum version number supported by Azure CI.
         AZURE_MIN_VERSION = 18
+
+        # Initialize RDMACoreCI, setting up both Travis and Azure DevOps adapters.
+        #
+        # @param repo [Repo] The Repo instance
         def initialize(repo)
             super(repo)
             @travis = GitMaintain::TravisCI.new(repo)
@@ -203,10 +260,10 @@ mv debian/changelog.new debian/changelog")
                 self.define_singleton_method(method) { |br, *args|
                     if br.version =~ /([0-9]+)/
                         major=$1.to_i
-                    elsif br.version == "master" 
+                    elsif br.version == "master"
                         major=99999
                     else
-                        raise("Unable to monitor branch #{br} on a CI")
+                        raise GitMaintainError.new("Unable to monitor branch #{br} on a CI")
                     end
                     if major < AZURE_MIN_VERSION
                         @travis.send(method, br, *args)
@@ -216,6 +273,7 @@ mv debian/changelog.new debian/changelog")
                 }
             }
         end
+        # Clear any cached build state for both Travis and Azure adapters.
         def emptyCache()
             @travis.emptyCache()
             @azure.emptyCache()

data/lib/{addons → git-maintain/addons}/git-maintain.rb

@@ -1,6 +1,16 @@
+# Module containing addon classes for git-maintain repository itself.
 module GitMaintain
+
+    # Subclass of Branch customized for the git-maintain repository.
     class GitMaintainBranch < Branch
+        # The name of this repository.
         REPO_NAME = "git-maintain"
+
+        # Configure release-specific command line options.
+        #
+        # @param action [Symbol] Selected action name
+        # @param optsParser [OptionParser] The OptionParser instance
+        # @param opts [Hash] The options hash to populate
         def self.set_opts(action, optsParser, opts)
             opts[:rel_type] = nil
 
@@ -13,13 +23,18 @@ module GitMaintain
                  optsParser.on("--stable", "Release a stable version.") {
                      opts[:rel_type] = :stable
                  }
-           end
+            end
         end
+
+        # Validate release-specific command line options.
+        #
+        # @param opts [Hash] Options hash to validate
+        # @raise [GitMaintainError] If rel_type is not specified
         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"
+                    raise GitMaintainError.new("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")
@@ -28,13 +43,20 @@ module GitMaintain
                 end
             end
         end
+
+        # Create a new release for git-maintain.
+        # Updates CHANGELOG, commits, and tags the release.
+        #
+        # @param opts [Hash] Options hash
+        # @raise [GitMaintainError] If prepping, committing, or tagging fails
         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[: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)
+                git_prev_ver = "v" + prev_ver
             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
@@ -45,7 +67,7 @@ module GitMaintain
             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}"
-            rep = GitMaintain::checkLog(opts, @local_branch, git_prev_ver, "release")
+            rep = checkLog(opts, @local_branch, git_prev_ver, "release")
             if rep != "y" then
                 puts "Skipping release"
                 return
@@ -55,7 +77,7 @@ module GitMaintain
             tag_path=`mktemp`.chomp()
             puts tag_path
             tag_file = File.open(tag_path, "w+")
-            tag_file.puts "git-maintain-#{new_ver}"
+            tag_file.puts "#{self.class::REPO_NAME}-#{new_ver}"
             tag_file.puts ""
             tag_file.puts changes
             tag_file.close()
@@ -69,20 +91,16 @@ $(cat CHANGELOG)
 EOF
 mv CHANGELOG.new CHANGELOG")
 
-            # Add and commit
-            @repo.runGit("add  CHANGELOG")
-            @repo.runGitInteractive("commit -F #{tag_path} --verbose --edit --signoff")
-            if $? != 0 then
-                raise("Failed to commit on branch #{local_branch}")
-            end
-            @repo.runGitInteractive("tag -a -s v#{new_ver} --edit -F #{tag_path}")
-            if $? != 0 then
-                raise("Failed to tag branch #{local_branch}")
-            end
+            release_do_add_commit_tag(opts, ["CHANGELOG"], "v" + new_ver, tag_path)
             `rm -f #{tag_path}`
         end
     end
+
+    # Repo class customized for the git-maintain repository.
     class GitMaintainRepo < Repo
+        # Initialize GitMaintainRepo with release notifications disabled.
+        #
+        # @param path [String] Repository directory path
         def initialize(path)
             super(path)
             @NOTIFY_RELEASE = false
@@ -91,4 +109,19 @@ mv CHANGELOG.new CHANGELOG")
     GitMaintain::registerCustom(GitMaintainBranch::REPO_NAME,
                                 { GitMaintain::Branch => GitMaintainBranch,
                                   GitMaintain::Repo => GitMaintainRepo})
+
+    # Subclass of GitMaintainBranch for cli_class_tool repository.
+    class CLIClassToolBranch < GitMaintainBranch
+        # Repository name constant for cli_class_tool.
+        REPO_NAME = "cli_class_tool"
+    end
+
+    # Subclass of GitMaintainRepo for cli_class_tool repository.
+    class CLIClassToolRepo < GitMaintainRepo
+    end
+
+    GitMaintain::registerCustom(CLIClassToolBranch::REPO_NAME,
+                                { GitMaintain::Branch => CLIClassToolBranch,
+                                  GitMaintain::Repo => CLIClassToolRepo})
+
 end

data/lib/git-maintain/addons/healthd.rb

@@ -0,0 +1,73 @@
+# Module containing addon classes for healthd repository.
+module GitMaintain
+
+    # Subclass of Branch customized for the healthd repository.
+    class HealthdBranch < Branch
+        # The name of this repository.
+        REPO_NAME = "healthd"
+
+        # Create a new release for healthd.
+        # Updates CHANGELOG, spect files, commits, and tags the release.
+        #
+        # @param opts [Hash] Options hash
+        # @raise [GitMaintainError] If prepping, committing, or tagging fails
+        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
+                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
+                new_ver =  (ver_nums[0 .. -3] + [ver_nums[-2].to_i() + 1 ] + [ "0" ]).join(".")
+                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}"
+            rep = checkLog(opts, @local_branch, git_prev_ver, "release")
+            if rep != "y" then
+                puts "Skipping release"
+                return
+            end
+
+            # Prepare tag message
+            tag_path=`mktemp`.chomp()
+            puts tag_path
+            tag_file = File.open(tag_path, "w+")
+            tag_file.puts "healthd-#{new_ver}"
+            tag_file.puts ""
+            tag_file.puts changes
+            tag_file.close()
+
+            @repo.run("cat <<EOF > CHANGELOG.new
+------------------
+#{new_ver} #{`date '+ (%Y-%m-%d)'`.chomp()}
+------------------
+
+$(cat CHANGELOG)
+EOF
+mv CHANGELOG.new CHANGELOG")
+
+            @repo.run("sed -i -e 's/\\(Version:[[:space:]]*\\)[0-9.]\\+/\\1#{new_ver}/g' */*.spec")
+
+            release_do_add_commit_tag(opts, ["CHANGELOG", "*/*.spec"], "v" + new_ver, tag_path)
+            `rm -f #{tag_path}`
+        end
+    end
+
+    # Repo class customized for the healthd repository.
+    class HealthdRepo < Repo
+        # Initialize HealthdRepo with release notifications disabled.
+        #
+        # @param path [String] Repository directory path
+        def initialize(path)
+            super(path)
+            @NOTIFY_RELEASE = false
+        end
+    end
+    GitMaintain::registerCustom(HealthdBranch::REPO_NAME,
+                                { GitMaintain::Branch => HealthdBranch,
+                                  GitMaintain::Repo => HealthdRepo})
+end