git-maintain 0.7.0 → 0.8.0

data/README.md

@@ -16,9 +16,9 @@ The idea is to script most of the maintenance tasks so the maintainer can focus
 - **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 travis state of all branches
+- **monitor**: Check the CI state of all branches
 - **push_stable**: Push to stable repo
-- **monitor_stable**: Check the travis state of all stable branches
+- **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
@@ -157,7 +157,7 @@ Apply them to the appropriate branches
 
 ```git maintain cp -s deadbeef --version '1[789]'```
 
-And push them to my own github repo so that Travis will check everything out
+And push them to my own github repo so that CI will check everything out
 
 ```git maintain push --version '1[789]'```
 
@@ -179,7 +179,7 @@ Push it to my own github too.
 
 ```git maintain push --version '1[789]' -b pending```
 
-Once this gets accepted (and Travis is OK too), I merge this branch back to my 'master'
+Once this gets accepted (and CI is OK too), I merge this branch back to my 'master'
 
 ```git maintain merge --version '1[789]' -m pending```
 
@@ -239,7 +239,7 @@ The tag will not have been propagated anywhere else and can be deleted manually.
 
 ```git maintain push_stable --version '1[789]'```
 
-You can then monitor the status on Travis
+You can then monitor the status on CI
 
 ```git maintain monitor_stable --version '1[789]'```
 
@@ -258,6 +258,8 @@ Enjoy, and feel free to report bugs, missing features and/or send patches
 
 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.  
    If unset, autofetch is enabled
@@ -274,3 +276,22 @@ This is a summary of all the settings that can be set in the git config:
  - `maintain.mail-format`: Specify how release annoucement emails are sent. Can be:
    - `imap_send`: Store prepared email in an IMAP folder. See `main git-imap-send` for more infos. This is the default value.
    - `send_email`: Generates a file which is compatible with git send-email
+
+# License
+
+Unless otherwise stated, everything in this repo is covered by the following
+copyright notice:
+
+    Copyright (c) 2018 SUSE
+
+    This program is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License version 3, as
+    published by the Free Software Foundation.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.

data/lib/addons/RDMACore.rb

@@ -1,6 +1,7 @@
 module GitMaintain
     class RDMACoreBranch < Branch
         REPO_NAME = "rdma-core"
+        AZURE_MIN_VERSION = 25
 
         def self.set_opts(action, optsParser, opts)
             opts[:rel_type] = nil
@@ -73,7 +74,7 @@ module GitMaintain
             end
 
             # Update version number in relevant files
-            @repo.run("sed -i -e 's/\\(Version:[[:space:]]*\\)[0-9.]\\+/\\1#{new_ver}/g' redhat/rdma-core.spec suse/rdma-core.spec")
+            @repo.run("sed -i -e 's/\\(Version:[[:space:]]*\\)[0-9.]\\+/\\1#{new_ver}/g' */*.spec")
             @repo.run("sed -i -e 's/\\([sS][eE][tT](PACKAGE_VERSION[[:space:]]*\"\\)[0-9.]*\"/\\1#{new_ver}\"/g' CMakeLists.txt")
 
             case opts[:rel_type]
@@ -93,7 +94,7 @@ mv debian/changelog.new debian/changelog")
             end
 
             # Add and commit
-            @repo.runGit("add  redhat/rdma-core.spec suse/rdma-core.spec CMakeLists.txt debian/changelog")
+            @repo.runGit("add  */*.spec CMakeLists.txt debian/changelog")
             @repo.runGitInteractive("commit -m '#{commit_msg} #{new_ver}' --verbose --edit --signoff")
             if $? != 0 then
                 raise("Failed to commit on branch #{local_branch}")
@@ -108,7 +109,57 @@ mv debian/changelog.new debian/changelog")
             `rm -f #{tag_path}`
         end
     end
+    class RDMACoreRepo < Repo
+        AZURE_MIN_VERSION = 25
+        def submitReleases(opts, new_tags)
+            new_tags.each(){|tag|
+                next if tag !~ /v([0-9]*)\.[0-9]*/
+                major=$1.to_i
+                # Starting from v27, do not create the github release ourself as this is done by Azure
+                createRelease(opts, tag, major < AZURE_MIN_VERSION)
+            }
+        end
+    end
+
+    class RDMACoreCI < CI
+        AZURE_MIN_VERSION = 25
+        def initialize(repo)
+            super(repo)
+            @travis = GitMaintain::TravisCI.new(repo)
+            @azure = GitMaintain::AzureCI.new(repo, 'ucfconsort', 'ucfconsort')
+
+            # Auto generate all CI required methods
+            # Wicked ruby tricker to find all the public methods of CI but not of inherited classes
+            # to dynamically define these method in the object being created
+            (GitMaintain::CI.new(repo).public_methods() - Object.new.public_methods()).each(){|method|
+                # Skip specific emptyCache method
+                next if method == :emptyCache
 
+                self.define_singleton_method(method) { |br, *args|
+                    if br.version =~ /([0-9]+)/
+                        major=$1.to_i
+                    elsif br.version == "master" 
+                        major=99999
+                    else
+                        raise("Unable to monitor branch #{br} on a CI")
+                    end
+                    if major < AZURE_MIN_VERSION
+                        @travis.send(method, br, *args)
+                    else
+                        @azure.send(method, br, *args)
+                    end
+                }
+            }
+        end
+        def emptyCache()
+            @travis.emptyCache()
+            @azure.emptyCache()
+        end
+    end
     GitMaintain::registerCustom(RDMACoreBranch::REPO_NAME,
-                                { GitMaintain::Branch => RDMACoreBranch })
+                                {
+                                    GitMaintain::Branch => RDMACoreBranch,
+                                    GitMaintain::Repo => RDMACoreRepo,
+                                    GitMaintain::CI => RDMACoreCI,
+                                })
 end

data/lib/branch.rb

@@ -33,34 +33,35 @@ module GitMaintain
             "* 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 travis state of all branches",
+            "* monitor: Check the CI state of all branches",
             "* push_stable: Push to stable repo",
-            "* monitor_stable: Check the travis state of all stable branches",
+            "* monitor_stable: Check the CI state of all stable branches",
             "* release: Create new release on all concerned branches",
             "* reset: Reset branch against upstream",
         ]
 
-        def self.load(repo, version, travis, branch_suff)
+        def self.load(repo, version, ci, branch_suff)
             repo_name = File.basename(repo.path)
-            return GitMaintain::loadClass(Branch, repo_name, repo, version, travis, branch_suff)
+            return GitMaintain::loadClass(Branch, repo_name, repo, version, ci, branch_suff)
         end
 
         def self.set_opts(action, optsParser, opts)
             opts[:base_ver] = 0
-            opts[:version] = /.*/
+            opts[:version] = []
             opts[:commits] = []
             opts[:do_merge] = false
             opts[:push_force] = false
-            opts[:no_travis] = false
+            opts[:no_ci] = false
             opts[:all] = false
             opts[:check_only] = false
             opts[:fetch] = nil
             opts[:watch] = false
+            opts[:delete_remote] = false
 
             optsParser.on("-v", "--base-version [MIN_VER]", Integer, "Older release to consider.") {
                 |val| opts[:base_ver] = val}
             optsParser.on("-V", "--version [regexp]", Regexp, "Regexp to filter versions.") {
-                |val| opts[:version] = val}
+                |val| opts[:version] << val}
 
             if  ALL_BRANCHES_ACTIONS.index(action) == nil &&
                 action != :merge &&
@@ -79,13 +80,16 @@ module GitMaintain
                 optsParser.banner += "-c <sha1> [-c <sha1> ...]"
                 optsParser.on("-c", "--sha1 [SHA1]", String, "Commit to cherry-pick. Can be used multiple time.") {
                     |val| opts[:commits] << val}
+            when :delete
+                optsParser.on("--remote", "Delete the remote staging branch instead of the local ones.") {
+                    |val| opts[:delete_remote] = 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
                 optsParser.on("-w", "--watch <PERIOD>", Integer,
-                              "Watch and refresh travis status every <PERIOD>.") {
+                              "Watch and refresh CI status every <PERIOD>.") {
                     |val| opts[:watch] = val}
             when :push
                 optsParser.banner += "[-f]"
@@ -93,8 +97,8 @@ module GitMaintain
                     |val| opts[:push_force] = val}
             when :push_stable
                 optsParser.banner += "[-T]"
-                optsParser.on("-T", "--no-travis", "Ignore Travis build status and push anyway.") {
-                    |val| opts[:no_travis] = true}
+                optsParser.on("-T", "--no-ci", "Ignore CI build status and push anyway.") {
+                    |val| opts[:no_ci] = true}
                 optsParser.on("-c", "--check", "Check if there is something to be pushed.") {
                     |val| opts[:check_only] = true}
             when :steal
@@ -112,18 +116,19 @@ module GitMaintain
                     raise "Action #{opts[:action]} can only be done on 'master' suffixed branches"
                 end
             end
-            if opts[:action] == :delete then
+            if opts[:action] == :delete && opts[:delete_remote] != true then
                 if opts[:br_suff] == "master" then
                     raise "Action #{opts[:action]} can NOT be done on 'master' suffixed branches"
                 end
             end
+            opts[:version] = [ /.*/ ] if opts[:version].length == 0
         end
 
         def self.execAction(opts, action)
             repo   = Repo::load()
-            travis = TravisChecker::load(repo)
+            ci = CI::load(repo)
             opts[:repo] = repo
-            opts[:travis] = travis
+            opts[:ci] = ci
             brClass = GitMaintain::getClass(self, repo.name)
 
             if NO_FETCH_ACTIONS.index(action) == nil && opts[:fetch] != false then
@@ -140,7 +145,7 @@ module GitMaintain
                     unfilteredList = repo.getBranchList(opts[:br_suff])
                 end
                 branchList = unfilteredList.map(){|br|
-                    branch = Branch::load(repo, br, travis, opts[:br_suff])
+                    branch = Branch::load(repo, br, ci, opts[:br_suff])
                     case branch.is_targetted?(opts)
                     when :too_old
                         GitMaintain::log(:VERBOSE, "Skipping older v#{branch.version}")
@@ -153,7 +158,7 @@ module GitMaintain
                     branch
                 }.compact()
             else
-                branchList = [ Branch::load(repo, opts[:manual_branch], travis, opts[:br_suff]) ]
+                branchList = [ Branch::load(repo, opts[:manual_branch], ci, opts[:br_suff]) ]
             end
 
             loop do
@@ -178,15 +183,15 @@ module GitMaintain
 
                 break if opts[:watch] == false
                 sleep(opts[:watch])
-                travis.emptyCache()
+                ci.emptyCache()
             end
         end
 
-        def initialize(repo, version, travis, branch_suff)
+        def initialize(repo, version, ci, branch_suff)
             GitMaintain::checkDirectConstructor(self.class)
 
             @repo          = repo
-            @travis        = travis
+            @ci            = ci
             @version       = version
             @branch_suff   = branch_suff
 
@@ -223,10 +228,10 @@ module GitMaintain
             if @version.to_i < opts[:base_ver] then
                 return :too_old
             end
-            if @version !~ opts[:version] then
-                return :no_match
-            end
-            return true
+            opts[:version].each() {|regexp|
+                return true if @version =~ regexp
+            }
+            return :no_match
         end
 
         # Checkout the repo to the given branch
@@ -271,7 +276,7 @@ module GitMaintain
             end
 
             master_sha=@repo.runGit("rev-parse origin/master")
-            res = steal_all(opts, "#{base_ref}..#{master_sha}")
+            res = steal_all(opts, "#{base_ref}..#{master_sha}", true)
 
             # If we picked all the commits (or nothing happened)
             # Mark the current master as the last checked point so we
@@ -345,22 +350,22 @@ module GitMaintain
                                "#{opts[:repo].valid_repo} #{branches.join(" ")}")
         end
 
-        # Monitor the build status on Travis
+        # Monitor the build status on CI
         def monitor(opts)
-            st = @travis.getValidState(head)
+            st = @ci.getValidState(self, @head)
             suff=""
             case st
             when "started"
-                suff= " started at #{@travis.getValidTS(head)}"
+                suff= " started at #{@ci.getValidTS(self, @head)}"
             end
             log(:INFO, "Status for v#{@version}: " + st + suff)
-            if (st == "failed" || st == "errored") && opts[:watch] == false
+            if @ci.isErrored(self, st) && opts[:watch] == false
                 rep = "y"
                 suff=""
                 while rep == "y"
                     rep = GitMaintain::confirm(opts, "see the build log#{suff}")
                     if rep == "y" then
-                        log = @travis.getValidLog(head)
+                        log = @ci.getValidLog(self, @head)
                         tmp = `mktemp`.chomp()
                         tmpfile = File.open(tmp, "w+")
                         tmpfile.puts(log)
@@ -375,9 +380,9 @@ module GitMaintain
 
         # Push branch to the stable repo
         def push_stable(opts)
-            if (opts[:no_travis] != true && @NO_TRAVIS != true) &&
-               @travis.checkValidState(@head) != true then
-                log(:WARNING, "Build is not passed on travis. Skipping push to stable")
+            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
 
@@ -408,13 +413,13 @@ module GitMaintain
             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 Travis
+         # Monitor the build status of the stable branch on CI
         def monitor_stable(opts)
-            st = @travis.getStableState(@stable_head)
+            st = @ci.getStableState(self, @stable_head)
             suff=""
             case st
             when "started"
-                suff= " started at #{@travis.getStableTS(@stable_head)}"
+                suff= " started at #{@ci.getStableTS(self, @stable_head)}"
             end
             log(:INFO, "Status for v#{@version}: " + st + suff)
         end
@@ -446,14 +451,36 @@ module GitMaintain
         end
 
         def delete(opts)
-            rep = GitMaintain::confirm(opts, "delete branch #{@local_branch}")
+            if opts[:delete_remote] == true then
+                msg = "delete remote branch #{@repo.valid_repo}/#{@local_branch}"
+            else
+                msg = "delete branch #{@local_branch}"
+            end
+            rep = GitMaintain::confirm(opts, msg)
             if rep == "y" then
-                @repo.runGit("branch -D #{@local_branch}")
+                return @local_branch
             else
                 log(:INFO, "Skipping deletion")
                 return
             end
         end
+        def self.delete_epilogue(opts, branches)
+            # Compact to remove empty entries
+            branches.compact!()
+
+            return if branches.length == 0
+            puts "Deleting #{opts[:delete_remote] == true ? "remote" : "local"} branches: #{branches.join(" ")}"
+            rep = GitMaintain::confirm(opts, "continue")
+            if rep != "y" then
+                log(:INFO, "Cancelling")
+                return
+            end
+            if opts[:delete_remote] == true then
+                opts[:repo].runGit("push #{opts[:repo].valid_repo} #{branches.map(){|x| ":" + x}.join(" ")}")
+            else
+                opts[:repo].runGit("branch -D  #{branches.join(" ")}")
+            end
+        end
 
         private
         def add_blacklist(commit)
@@ -532,13 +559,15 @@ module GitMaintain
 	        end
 
 	        # Let's see if there's a version tag in this commit
-	        full=@repo.runGit("show #{commit} | grep -i 'stable@'").gsub(/.* /, "")
+	        full=@repo.runGit("show #{commit} | grep -i 'stable@'").gsub(/.* #?/, "")
 
 	        # Sanity check our extraction
             if full =~ /stable/ then
                 return false
             end
 
+            full = @repo.runGit("rev-parse #{full}^{commit}")
+
 	        # Make sure our branch contains this version
 	        if @repo.runGit("merge-base #{@head} #{full}") == full then
 		        return true
@@ -607,17 +636,23 @@ module GitMaintain
             return do_cp
         end
 
-        def steal_one(opts, commit)
-		    subj=@repo.getCommitSubj(commit)
-            subj.gsub!(/"/, '\"')
+        def steal_one(opts, commit, mainline=false)
 		    msg=''
-
-		    # Let's grab the mainline commit id, this is useful if the version tag
-		    # doesn't exist in the commit we're looking at but exists upstream.
-		    orig_cmt=@repo.runGit("log --no-merges --format=\"%H\" -F --grep \"#{subj}\" " +
-            "#{@stable_base}..origin/master | tail -n1")
-
-		    # If the commit doesn't apply for us, skip it
+            orig_cmt=commit
+
+            if mainline == false then
+		        subj=@repo.getCommitSubj(commit)
+                subj.gsub!(/"/, '\"')
+		        # Let's grab the mainline commit id, this is useful if the version tag
+		        # doesn't exist in the commit we're looking at but exists upstream.
+		        orig_cmt=@repo.runGit("log --no-merges --format=\"%H\" -F --grep \"#{subj}\" " +
+                                      "#{@stable_base}..origin/master | tail -n1")
+
+                if orig_cmt == "" then
+                    log(:WARNING, "Could not find commit #{commit} in mainline")
+                end
+            end
+            # If the commit doesn't apply for us, skip it
 		    if is_relevant?(orig_cmt) != true
                 return true
 		    end
@@ -663,10 +698,10 @@ module GitMaintain
             end
         end
 
-        def steal_all(opts, range)
+        def steal_all(opts, range, mainline = false)
             res = true
  	        @repo.runGit("log --no-merges --format=\"%H\" #{range} | tac").split("\n").each(){|commit|
-                res &= steal_one(opts, commit)
+                res &= steal_one(opts, commit, mainline)
             }
             return res
        end