git-maintain 0.7.0 → 0.9.0rc1

data/lib/repo.rb

@@ -1,3 +1,6 @@
+require 'octokit'
+require 'io/console'
+
 module GitMaintain
     class Repo
         @@VALID_REPO = "github"
@@ -10,10 +13,10 @@ module GitMaintain
             # Internal commands for completion
             :list_suffixes, :submit_release
         ]
-        ACTION_HELP = [
-            "* submit_release: Push the to stable and create the release packages",
-            "* summary: Displays a summary of the configuration and the branches git-maintain sees"
-        ]
+        ACTION_HELP = {
+            :submit_release => "Push the tags to 'stable' remote and create the release packages",
+            :summary => "Displays a summary of the configuration and the branches git-maintain sees"
+        }
 
         def self.load(path=".")
             dir = Dir.pwd()
@@ -45,6 +48,7 @@ module GitMaintain
             @branch_list=nil
             @stable_branches=nil
             @suffix_list=nil
+            @config_cache={}
 
             if path == nil
                 @path = Dir.pwd()
@@ -134,7 +138,7 @@ module GitMaintain
                   fi; git --work-tree=#{@path} imap-send #{cmd}`
         end
         def getGitConfig(entry)
-            return runGit("config #{entry} 2> /dev/null").chomp()
+            return @config_cache[entry] ||= runGit("config #{entry} 2> /dev/null").chomp()
         end
 
         def runBash()
@@ -194,7 +198,7 @@ module GitMaintain
             return @suffix_list
         end
 
-        def submitReleases(opts)
+        def getUnreleasedTags(opts)
             remote_tags=runGit("ls-remote --tags #{@stable_repo} |
                                  egrep 'refs/tags/v[0-9.]*$'").split("\n").map(){
                 |x| x.gsub(/.*refs\/tags\//, '')
@@ -202,75 +206,76 @@ module GitMaintain
             local_tags =runGit("tag -l | egrep '^v[0-9.]*$'").split("\n")
 
             new_tags = local_tags - remote_tags
-            if new_tags.empty? then
-                log(:INFO,  "All tags are already submitted.")
-                return
-            end
-
-            log(:WARNING, "This will officially release these tags: #{new_tags.join(", ")}")
-            rep = GitMaintain::confirm(opts, "release them")
-            if rep != 'y' then
-                raise "Aborting.."
-            end
-
-            if @NOTIFY_RELEASE != false
-                mail_path=`mktemp`.chomp()
-                mail = File.open(mail_path, "w+")
-                mail.puts "From " + runGit("rev-parse HEAD") + " " + `date`.chomp()
-                mail.puts "From: " + getGitConfig("user.name") +
-                          " <" + getGitConfig("user.email") +">"
-                mail.puts "To: " + getGitConfig("patch.target")
-                mail.puts "Date: " + `date -R`.chomp()
-
-                if new_tags.length > 4 then
-                    mail.puts "Subject: [ANNOUNCE] " + File.basename(@path) + ": new stable releases"
-                    mail.puts ""
-                    mail.puts "These version were tagged/released:\n * " +
-                              new_tags.join("\n * ")
-                    mail.puts ""
-                else
-                    mail.puts "Subject: [ANNOUNCE] " + File.basename(@path) + " " +
-                              (new_tags.length > 1 ?
-                                   (new_tags[0 .. -2].join(", ") + " and " + new_tags[-1] + " have") :
-                                   (new_tags.join(" ") + " has")) +
-                              " been tagged/released"
-                    mail.puts ""
-                end
-                mail.puts "It's available at the normal places:"
+            return new_tags
+        end
+        def genReleaseNotif(opts, new_tags)
+            return if @NOTIFY_RELEASE == false
+
+            mail_path=`mktemp`.chomp()
+            mail = File.open(mail_path, "w+")
+            mail.puts "From " + runGit("rev-parse HEAD") + " " + `date`.chomp()
+            mail.puts "From: " + getGitConfig("user.name") +
+                      " <" + getGitConfig("user.email") +">"
+            mail.puts "To: " + getGitConfig("patch.target")
+            mail.puts "Date: " + `date -R`.chomp()
+
+            if new_tags.length > 4 then
+                mail.puts "Subject: [ANNOUNCE] " + File.basename(@path) + ": new stable releases"
                 mail.puts ""
-                mail.puts "git://github.com/#{@remote_stable}"
-                mail.puts "https://github.com/#{@remote_stable}/releases"
+                mail.puts "These version were tagged/released:\n * " +
+                          new_tags.join("\n * ")
                 mail.puts ""
-                mail.puts "---"
+            else
+                mail.puts "Subject: [ANNOUNCE] " + File.basename(@path) + " " +
+                          (new_tags.length > 1 ?
+                               (new_tags[0 .. -2].join(", ") + " and " + new_tags[-1] + " have") :
+                               (new_tags.join(" ") + " has")) +
+                          " been tagged/released"
                 mail.puts ""
-                mail.puts "Here's the information from the tags:"
-                new_tags.sort().each(){|tag|
-                    mail.puts `git show #{tag} --no-decorate -q | awk '!p;/^-----END PGP SIGNATURE-----/{p=1}'`
-                    mail.puts ""
-                }
-                mail.puts "It's available at the normal places:"
+            end
+            mail.puts "It's available at the normal places:"
+            mail.puts ""
+            mail.puts "git://github.com/#{@remote_stable}"
+            mail.puts "https://github.com/#{@remote_stable}/releases"
+            mail.puts ""
+            mail.puts "---"
+            mail.puts ""
+            mail.puts "Here's the information from the tags:"
+            new_tags.sort().each(){|tag|
+                mail.puts `git show #{tag} --no-decorate -q | awk '!p;/^-----END PGP SIGNATURE-----/{p=1}'`
                 mail.puts ""
-                mail.puts "git://github.com/#{@remote_stable}"
-                mail.puts "https://github.com/#{@remote_stable}/releases"
-                mail.close()
-
-                case @mail_format
-                when :imap_send
-                    puts runGitImap("< #{mail_path}")
-                when :send_email
-                    run("cp #{mail_path} announce-release.eml")
-                    log(:INFO, "Generated annoucement email in #{@path}/announce-release.eml")
-                end
-                run("rm -f #{mail_path}")
+            }
+            mail.close()
+
+            case @mail_format
+            when :imap_send
+                puts runGitImap("< #{mail_path}")
+            when :send_email
+                run("cp #{mail_path} announce-release.eml")
+                log(:INFO, "Generated annoucement email in #{@path}/announce-release.eml")
             end
+            run("rm -f #{mail_path}")
+        end
+        def submitReleases(opts, new_tags)
+            new_tags.each(){|tag|
+                createRelease(opts, tag)
+            }
+        end
 
-            log(:WARNING, "Last chance to cancel before submitting")
-            rep= GitMaintain::confirm(opts, "submit these releases")
-            if rep != 'y' then
-                raise "Aborting.."
+        def createRelease(opts, tag, github_rel=true)
+            log(:INFO, "Creating a release for #{tag}")
+		    runGit("push #{@stable_repo} refs/tags/#{tag}")
+
+            if github_rel == true then
+ 		        msg = runGit("tag -l -n1000 '#{tag}'") + "\n"
+
+		        # Ye ghods is is a horrific format to parse
+		        name, body = msg.split("\n", 2)
+		        name = name.gsub(/^#{tag}/, '').strip
+		        body = body.split("\n").map { |l| l.sub(/^    /, '') }.join("\n")
+		        api.create_release(@remote_stable, tag, :name => name, :body => body)
             end
-            puts `#{@@SUBMIT_BINARY}`
-        end
+       end
 
         def versionToLocalBranch(version, suff)
             return @branch_format_raw.gsub(/\\\//, '/').
@@ -304,12 +309,33 @@ module GitMaintain
             puts getSuffixList()
         end
         def submit_release(opts)
-            submitReleases(opts)
+            new_tags = getUnreleasedTags(opts)
+            if new_tags.empty? then
+                log(:INFO,  "All tags are already submitted.")
+                return
+            end
+
+            log(:WARNING, "This will officially release these tags: #{new_tags.join(", ")}")
+            rep = GitMaintain::confirm(opts, "release them", true)
+            if rep != 'y' then
+                raise "Aborting.."
+            end
+
+            if @NOTIFY_RELEASE != false
+                genReleaseNotif(opts, new_tags)
+            end
+
+            log(:WARNING, "Last chance to cancel before submitting")
+            rep= GitMaintain::confirm(opts, "submit these releases", true)
+            if rep != 'y' then
+                raise "Aborting.."
+            end
+            submitReleases(opts, new_tags)
         end
         def summary(opts)
              log(:INFO, "Configuration summary:")
-             log(:INFO, "Stable remote: #{@@STABLE_REPO}")
-             log(:INFO, "Validation remote: #{@@VALID_REPO}")
+             log(:INFO, "Stable remote: #{@stable_repo}")
+             log(:INFO, "Validation remote: #{@valid_repo}")
              log(:INFO, "")
              log(:INFO, "Branch config:")
              log(:INFO, "Local branch format: /#{@branch_format_raw}/")
@@ -369,5 +395,50 @@ module GitMaintain
 
             return alts
         end
-    end
+
+        #
+        # Github API stuff
+        #
+	    def api
+		    @api ||= Octokit::Client.new(:access_token => token, :auto_paginate => true)
+	    end
+
+	    def token
+		    @token ||= begin
+			               # We cannot use the 'defaults' functionality of git_config here,
+			               # because get_new_token would be evaluated before git_config ran
+			               tok = getGitConfig("maintain.api-token")
+                           tok.to_s() == "" ? get_new_token : tok
+		               end
+	    end
+ 	    def get_new_token
+		    puts "Requesting a new OAuth token from Github..."
+		    print "Github username: "
+		    user = $stdin.gets.chomp
+		    print "Github password: "
+		    pass = $stdin.noecho(&:gets).chomp
+		    puts
+
+		    api = Octokit::Client.new(:login => user, :password => pass)
+
+		    begin
+			    res = api.create_authorization(:scopes => [:repo], :note => "git-maintain")
+		    rescue Octokit::Unauthorized
+			    puts "Username or password incorrect.  Please try again."
+			    return get_new_token
+            rescue Octokit::OneTimePasswordRequired
+		        print "Github OTP: "
+		        otp = $stdin.noecho(&:gets).chomp
+			    res = api.create_authorization(:scopes => [:repo], :note => "git-maintain",
+                                               :headers => {"X-GitHub-OTP" => otp})
+		    end
+
+		    token = res[:token]
+		    runGit("config --global maintain.api-token '#{token}'")
+
+            # Now reopen with the token so OTP does not bother us
+            @api=nil
+            token
+	    end
+   end
 end

data/lib/travis.rb

@@ -1,56 +1,13 @@
 module GitMaintain
-    class TravisChecker
-        TRAVIS_URL='https://api.travis-ci.org/'
-
-        def self.load(repo)
-            repo_name = File.basename(repo.path)
-            return GitMaintain::loadClass(TravisChecker, repo_name, repo)
-        end
+    class TravisCI < CI
+        TRAVIS_URL='https://api.travis-ci.com/'
 
         def initialize(repo)
-            GitMaintain::checkDirectConstructor(self.class)
-
-            @repo = repo
-            @cachedJson={}
+            super(repo)
+            @url = TRAVIS_URL
         end
 
         private
-        def log(lvl, str)
-            GitMaintain::log(lvl, str)
-        end
-
-        def fetch(uri_str, limit = 10)
-            # You should choose a better exception.
-            raise ArgumentError, 'too many HTTP redirects' if limit == 0
-
-            response = Net::HTTP.get_response(URI(uri_str))
-
-            case response
-            when Net::HTTPSuccess then
-                response
-            when Net::HTTPRedirection then
-                location = response['location']
-                fetch(location, limit - 1)
-            else
-                response.value
-            end
-        end
-        def getJson(query_label, query, json=true)
-            return @cachedJson[query_label] if @cachedJson[query_label] != nil
-            url = TRAVIS_URL + query
-            uri = URI(url)
-            log(:INFO, "Querying travis...")
-            log(:DEBUG_TRAVIS, url)
-            response = fetch(uri)
-            raise("Travis request failed '#{url}'") if response.code.to_s() != '200'
-
-            if json == true
-                @cachedJson[query_label] = JSON.parse(response.body)
-            else
-                @cachedJson[query_label] = response.body
-            end
-            return @cachedJson[query_label]
-        end
         def getState(sha1, resp)
             br = findBranch(sha1, resp)
             return "not found" if br == nil
@@ -61,7 +18,7 @@ module GitMaintain
             br = findBranch(sha1, resp)
             raise("Travis build not found") if br == nil
             job_id = br["job_ids"].last().to_s()
-            return getJson("log_" + job_id, 'jobs/' + job_id + '/log', false)
+            return getJson(@url, "travis_log_" + job_id, 'jobs/' + job_id + '/log', false)
         end
         def getTS(sha1, resp)
             br = findBranch(sha1, resp)
@@ -73,17 +30,17 @@ module GitMaintain
         end
 
         def getBrValidJson()
-            return getJson(:br_valid, 'repos/' + @repo.remote_valid + '/branches')
+            return getJson(@url, :travis_br_valid, 'repos/' + @repo.remote_valid + '/branches')
         end
         def getBrStableJson()
-            return getJson(:br_stable, 'repos/' + @repo.remote_stable + '/branches')
+            return getJson(@url, :travis_br_stable, 'repos/' + @repo.remote_stable + '/branches')
         end
         def findBranch(sha1, resp)
-            log(:DEBUG_TRAVIS, "Looking for build for #{sha1}")
+            log(:DEBUG_CI, "Looking for build for #{sha1}")
             resp["branches"].each(){|br|
                 commit=resp["commits"].select(){|e| e["id"] == br["commit_id"]}.first()
                 raise("Incomplete JSON received from Travis") if commit == nil
-                log(:DEBUG_TRAVIS, "Found entry for sha #{commit["sha"]}")
+                log(:DEBUG_CI, "Found entry for sha #{commit["sha"]}")
                 next if commit["sha"] != sha1
                 return br
             }
@@ -91,33 +48,33 @@ module GitMaintain
         end
 
         public
-        def getValidState(sha1)
+        def getValidState(br, sha1)
             return getState(sha1, getBrValidJson())
         end
-        def checkValidState(sha1)
+        def checkValidState(br, sha1)
             return checkState(sha1, getBrValidJson())
         end
-        def getValidLog(sha1)
+        def getValidLog(br, sha1)
             return getLog(sha1, getBrValidJson())
         end
-        def getValidTS(sha1)
+        def getValidTS(br, sha1)
             return getTS(sha1, getBrValidJson())
         end
 
-        def getStableState(sha1)
+        def getStableState(br, sha1)
             return getState(sha1, getBrStableJson())
         end
-        def checkStableState(sha1)
+        def checkStableState(br, sha1)
             return checkState(sha1, getBrStableJson())
         end
-        def getStableLog(sha1)
+        def getStableLog(br, sha1)
             return getLog(sha1, getBrStableJson())
         end
-        def getStableTS(sha1)
+        def getStableTS(br, sha1)
             return getTS(sha1, getBrStableJson())
         end
-        def emptyCache()
-            @cachedJson={}
+        def isErrored(br, status)
+            return status == "failed" || status == "errored"
         end
     end
 end

metadata

@@ -1,29 +1,35 @@
 --- !ruby/object:Gem::Specification
 name: git-maintain
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.9.0rc1
 platform: ruby
 authors:
 - Nicolas Morey-Chaisemartin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-05-29 00:00:00.000000000 Z
+date: 2022-10-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: github-release
+  name: octokit
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '5'
 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.
@@ -39,13 +45,16 @@ files:
 - bin/git-maintain
 - git-maintain-completion.sh
 - lib/addons/RDMACore.rb
+- lib/addons/git-maintain.rb
+- lib/azure.rb
 - lib/branch.rb
+- lib/ci.rb
 - lib/common.rb
 - lib/repo.rb
 - lib/travis.rb
 homepage: https://github.com/nmorey/git-maintain
 licenses:
-- MIT
+- GPL-3.0
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -58,12 +67,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.0.8
 signing_key: 
 specification_version: 4
-summary: Your ultimate script for maintaining stable branches.
+summary: Your ultimate script for maintaining stable branches and releasing your project.
 test_files: []