git-maintain 0.5.0.pre.11.g7c08aac → 0.5.0.pre.13.ge72a2b0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0d77c8e6dedcb14bd6d4598218f99a05a4c38f83012cac2ecd0d50d8dc106d81
-  data.tar.gz: 8c744c16fbe487e788a75e6eb6e711ba3a847deef667340f1a5d0c65e60324db
+  metadata.gz: 44043bb13255df2557298655ba268fa2775f32f543f0fc50785dc9944e47b578
+  data.tar.gz: b3af11b591ce0c4096c4df44cf8d52c7d8bd8015e5d5cb1204bbbfe0d8b6656d
 SHA512:
-  metadata.gz: fc6fe26f35d9802c57521e3cf855680cd7f0b3cf15eb4c9795702967da29516569b93128ae2cfd3247e637b86e28b4165d759c9fc9c278b24465a50afe0c0d50
-  data.tar.gz: 9348465af84b807191623b171970c237da5c22b6c52c4388468c559d7a8f363254a97d2289007fd94ed921f843a25e876197c7940eb980f3bc11acf0d89be3b3
+  metadata.gz: bb884e28eb8e4f60f262a36aed4bcab2c383ee80ebc3952f847d89d9f9c77bac8db409474d2062beda3e263225ddb43ce552f01a38ee492fbddb5200a49a0cae
+  data.tar.gz: 671e9220b866fa12c048dc531e609726e723b6a5c0028c0998868f976b42fef8b0f5e686dd42b9c9db96bd39e14afb4ade2d5feff7a0cda8ea87af4f1c292b03

data/CHANGELOG

@@ -4,6 +4,8 @@
 * Cleanup release email
 * Add build timestamp for running build in monitor
 * Add --watch for monitor and monitor_stable
+* Fix bad output ot git maintain steal
+* Rewrite log system and handle colors
 
 ------------------
 0.5.0  (2019-02-05)

data/bin/git-maintain

@@ -45,6 +45,8 @@ optsParser.on("-b", "--branch-suffix [SUFFIX]", "Branch suffix. Default is 'mast
     |val| opts[:br_suff] = val}
 optsParser.on("-n", "--no", "Assume no to all questions.") {
     |val| opts[:no] = true}
+optsParser.on("--verbose", "Displays more informations.") {
+    |val| GitMaintain::setVerbose(true)}
 GitMaintain::setOpts(action, optsParser, opts)
 
 rest = optsParser.order!(ARGV);

data/lib/branch.rb

@@ -120,10 +120,10 @@ module GitMaintain
                     branch = Branch::load(repo, br, travis, opts[:br_suff])
                     case branch.is_targetted?(opts)
                     when :too_old
-                        puts "# Skipping older v#{branch.version}"
+                        log(:VERBOSE, "Skipping older v#{branch.version}")
                         next
                     when :no_match
-                        puts "# Skipping v#{branch.version} not matching #{opts[:version].to_s()}"
+                        log(:VERBOSE, "Skipping v#{branch.version} not matching #{opts[:version].to_s()}")
                         next
                     end
                     branch
@@ -136,10 +136,7 @@ module GitMaintain
                 system("clear; date") if opts[:watch] != false
                 branchList.each(){|branch|
                     if NO_CHECKOUT_ACTIONS.index(action) == nil  then
-                        puts "###############################"
-                        puts "# Working on #{branch.verbose_name}"
-                        puts "###############################"
-
+                        GitMaintain::log(:INFO, "Working on #{branch.verbose_name}")
                         branch.checkout()
                     end
                     branch.send(action, opts)
@@ -177,6 +174,10 @@ module GitMaintain
         end
         attr_reader :version, :local_branch, :head, :remote_branch, :remote_ref, :stable_head, :verbose_name
 
+        def log(lvl, str)
+            GitMaintain::log(lvl, str)
+        end
+
         def is_targetted?(opts)
             return true if @branch_type == :user_specified
             if @version.to_i < opts[:base_ver] then
@@ -201,9 +202,8 @@ module GitMaintain
             opts[:commits].each(){|commit|
                 @repo.runGit("cherry-pick #{commit}")
                 if $? != 0 then
-                    puts "Cherry pick failure. Starting bash for manual fixes. Exit shell to continue"
-			        @repo.runSystem("bash")
-                    puts "Continuing..."
+                    log(:WARNING, "Cherry pick failure. Starting bash for manual fixes. Exit shell to continue")
+			        @repo.runBash()
 		        end
 		        make_pretty(commit)
             }
@@ -219,8 +219,8 @@ module GitMaintain
                 sha = @repo.runGit("rev-parse 'git-maintain/steal/last/#{@stable_base}' 2>&1")
                 if $? == 0 then
                     base_ref=sha
-                    puts "# INFO: Starting from last successfull run:"
-                    puts "# INFO: " + @repo.runGit("show --format=oneline #{base_ref}")
+                    log(:VERBOSE, "Starting from last successfull run:")
+                    log(:VERBOSE, @repo.getCommitHeadline(base_ref))
                 end
             end
 
@@ -232,9 +232,9 @@ module GitMaintain
             # can just steal from this point on the next run
             if res == true then
                 @repo.runGit("tag -f 'git-maintain/steal/last/#{@stable_base}' origin/master")
-                puts "# INFO: Marking new last successfull run at:"
-                puts "# INFO: " + @repo.runGit("show --format=oneline #{master_sha}")
-         end
+                log(:VERBOSE, "Marking new last successfull run at:")
+                log(:VERBOSE, @repo.getCommitHeadline(master_sha))
+            end
         end
 
         # List commits in the branch that are no in the stable branch
@@ -249,12 +249,11 @@ module GitMaintain
             if rep == "y" then
                 @repo.runGit("merge #{merge_branch}")
                 if $? != 0 then
-                    puts "Merge failure. Starting bash for manual fixes. Exit shell to continue"
-			        @repo.runSystem("bash")
-                    puts "Continuing..."
+                    log(:WARNING, "Merge failure. Starting bash for manual fixes. Exit shell to continue")
+			        @repo.runBash()
 		        end
             else
-                puts "Skipping merge"
+                log(:INFO, "Skipping merge")
                 return
             end 
         end
@@ -272,7 +271,7 @@ module GitMaintain
             when "started"
                 suff= " started at #{@travis.getValidTS(head)}"
             end
-            puts "Status for v#{@version}: " + st + suff
+            log(:INFO, "Status for v#{@version}: " + st + suff)
             if st == "failed"
                 rep = "y"
                 suff=""
@@ -296,13 +295,13 @@ module GitMaintain
         def push_stable(opts)
             if (opts[:no_travis] != true && @NO_TRAVIS != true) &&
                @travis.checkValidState(@head) != true then
-                puts "Build is not passed on travis. Skipping push to stable"
+                log(:WARNING, "Build is not passed on travis. Skipping push to stable")
                 return
             end
             c1=@repo.runGit("rev-parse --verify --quiet #{@local_branch}")
             c2=@repo.runGit("rev-parse --verify --quiet #{@remote_ref}")
             if c1 == c2 then
-                puts "Stable is already up-to-date"
+                log(:INFO, "Stable is already up-to-date")
                 return
             end
 
@@ -315,7 +314,7 @@ module GitMaintain
             if rep == "y" then
                 @repo.runGit("push #{@repo.stable_repo} #{@local_branch}:#{@remote_branch}")
             else
-                puts "Skipping push to stable"
+                log(:INFO, "Skipping push to stable")
                 return
             end
         end
@@ -328,7 +327,7 @@ module GitMaintain
             when "started"
                 suff= " started at #{@travis.getStableTS(@stable_head)}"
             end
-            puts "Status for v#{@version}: " + st + suff
+            log(:INFO, "Status for v#{@version}: " + st + suff)
         end
 
         # Reset the branch to the upstream stable one
@@ -337,13 +336,13 @@ module GitMaintain
             if rep == "y" then
                 @repo.runGit("reset --hard #{@remote_ref}")
             else
-                puts "Skipping reset"
+                log(:INFO, "Skipping reset")
                 return
             end
         end
 
         def release(opts)
-            puts "#No release command available for this repo"
+            log(:ERROR,"#No release command available for this repo")
         end
 
         private
@@ -375,7 +374,7 @@ module GitMaintain
 	        # This might happen if someone pointed to a commit that doesn't exist in our
 	        # tree.
 	        if $? != 0 then
-                puts "# WARNING: Commit #{src_commit} points to a SHA #{commit} not in tree"
+                log(:WARNING, "Commit #{src_commit} points to a SHA #{commit} not in tree")
 		        return false
 	        end
 
@@ -467,11 +466,11 @@ module GitMaintain
         def confirm_one(opts, commit)
  		    rep=""
 		    do_cp=false
-		    puts @repo.runGit("show --format=oneline --no-patch --no-decorate #{commit}")
+		    puts @repo.getCommitHeadline(commit)
 		    while rep != "y" do
 			    puts "Do you want to steal this commit ? (y/n/b/?)"
                 if opts[:no] == true then
-                    puts "Auto-replying no due to --no option"
+                    log(:INFO, "Auto-replying no due to --no option")
                     rep = 'n'
                     break
                 else
@@ -479,10 +478,10 @@ module GitMaintain
                 end
 			    case rep
 				when "n"
-			        puts "Skip this commit"
+			        log(:INFO, "Skip this commit")
 					break
 				when "b"
-					puts "Blacklisting this commit for the current branch"
+					LOG(:INFO, "Blacklisting this commit for the current branch")
 					add_blacklist(commit)
 					break
 				when "y"
@@ -492,7 +491,7 @@ module GitMaintain
 				when "?"
 					puts @repo.runGit("show #{commit}")
                 else
-					STDERR.puts "Invalid answer $rep"
+					log(:ERROR, "Invalid answer $rep")
 		            puts @repo.runGit("show --format=oneline --no-patch --no-decorate #{commit}")
                 end
 		    end
@@ -522,8 +521,8 @@ module GitMaintain
 		    # Check if it's not blacklisted by a git-notes
 		    if is_blacklisted?(orig_cmt) == true then
 		        # Commit is blacklisted
-			    puts "Skipping 'blacklisted' commit " +
-                     @repo.runGit("show --format=oneline --no-patch --no-decorate #{orig_cmt}")
+			    log(:INFO, "Skipping 'blacklisted' commit " +
+                     @repo.runGit("log --format=oneline --no-patch --no-decorate #{orig_cmt}"))
                 return true
 		    end
 
@@ -533,7 +532,7 @@ module GitMaintain
             begin
 		        pick_one(commit)
             rescue CherryPickErrorException => e
-			    puts "Cherry pick failed. Fix, commit (or reset) and exit."
+			    log(:WARNING, "Cherry pick failed. Fix, commit (or reset) and exit.")
 			    @repo.runSystem("/bin/bash")
                 return false
             end
@@ -543,7 +542,7 @@ module GitMaintain
 		    if orig_cmt == "" then
 			    msg="Custom"
 			    orig_cmt=@repo.runGit("rev-parse HEAD")
-			    puts "Custom commit, please double-check!"
+			    log(:WARNING, "Custom commit, please double-check!")
 			    @repo.runSystem("/bin/bash")
 		    end
 		    make_pretty(orig_cmt, msg)

data/lib/common.rb

@@ -6,6 +6,39 @@ require 'branch'
 
 $LOAD_PATH.pop()
 
+class String
+    # colorization
+    @@is_a_tty = nil
+    def colorize(color_code)
+        @@is_a_tty = STDOUT.isatty() if @@is_a_tty == nil
+        if @@is_a_tty then
+            return "\e[#{color_code}m#{self}\e[0m"
+        else
+            return self
+        end
+    end
+
+    def red
+        colorize(31)
+    end
+
+    def green
+        colorize(32)
+    end
+
+    def brown
+        colorize(33)
+    end
+
+    def blue
+        colorize(34)
+    end
+
+    def magenta
+        colorize(35)
+    end
+end
+
 module GitMaintain
     class Common
         ACTION_LIST = [ :list_actions ]
@@ -18,6 +51,8 @@ module GitMaintain
     ACTION_CLASS = [ Common, Branch, Repo ]
     @@custom_classes = {}
 
+    @@verbose_log = false
+
     def registerCustom(repo_name, classes)
         raise("Multiple class for repo #{repo_name}") if @@custom_classes[repo_name] != nil
         @@custom_classes[repo_name] = classes
@@ -32,10 +67,10 @@ module GitMaintain
     def loadClass(default_class, repo_name, *more)
         custom = @@custom_classes[repo_name]
         if custom != nil && custom[default_class] != nil then
-            puts "# Detected custom #{default_class} class for repo '#{repo_name}'" if ENV['DEBUG'] == "1"
+            log(:DEBUG,"Detected custom #{default_class} class for repo '#{repo_name}'")
             return custom[default_class].new(*more)
         else
-            puts "# Detected NO custom #{default_class} classes for repo '#{repo_name}'" if ENV['DEBUG'] == "1"
+            log(:DEBUG,"Detected NO custom #{default_class} classes for repo '#{repo_name}'")
             return default_class.new(*more)
         end
     end
@@ -110,6 +145,35 @@ module GitMaintain
     end
     module_function :checkLog
 
+    def _log(lvl, str, out=STDOUT)
+        puts("# " + lvl.to_s() + ": " + str)
+    end
+    module_function :_log
+
+    def log(lvl, str)
+        case lvl
+        when :DEBUG
+            _log("DEBUG".magenta(), str) if ENV["DEBUG"].to_s() != ""
+        when :DEBUG_TRAVIS
+            _log("DEBUG_TRAVIS".magenta(), str) if ENV["DEBUG_TRAVIS"].to_s() != ""
+        when :VERBOSE
+            _log("INFO".blue(), str) if @@verbose_log == true
+        when :INFO
+            _log("INFO".green(), str)
+        when :WARNING
+            _log("WARNING".brown(), str)
+        when :ERROR
+            _log("ERROR".red(), str, STDERR)
+        else
+            _log(lvl, str)
+        end
+    end
+    module_function :log
+
+    def setVerbose(val)
+        @@verbose_log = val
+    end
+    module_function :setVerbose
 end
 $LOAD_PATH.pop()
 

data/lib/repo.rb

@@ -67,6 +67,10 @@ module GitMaintain
         end
         attr_reader :path, :remote_valid, :remote_stable, :valid_repo, :stable_repo
 
+        def log(lvl, str)
+            GitMaintain::log(lvl, str)
+        end
+
         def run(cmd)
             return `cd #{@path} && #{cmd}`
         end
@@ -74,10 +78,8 @@ module GitMaintain
             return system("cd #{@path} && #{cmd}")
         end
         def runGit(cmd)
-            if ENV["DEBUG"].to_s() != "" then
-                puts "Called from #{caller[1]}"
-                puts "Running git command '#{cmd}'"
-            end
+            log(:DEBUG, "Called from #{caller[1]}")
+            log(:DEBUG, "Running git command '#{cmd}'")
             return `git --work-tree=#{@path} #{cmd}`.chomp()
         end
         def runGitImap(cmd)
@@ -90,8 +92,22 @@ module GitMaintain
                   fi; git --work-tree=#{@path} imap-send #{cmd}`
         end
 
+        def runBash()
+            runSystem("bash")
+            if $? == 0 then
+                log(:INFO, "Continuing...")
+            else
+                log(:ERROR, "Shell exited with code #{$?}. Exiting")
+                raise("Cancelled by user")
+            end
+        end
+
+        def getCommitHeadline(sha)
+            return runGit("show --format=oneline --no-patch --no-decorate #{sha}")
+        end
+
         def stableUpdate()
-            puts "# Fetching stable updates..."
+            log(:VERBOSE, "Fetching stable updates...")
             runGit("fetch #{@stable_repo}")
         end
         def getStableList(br_suff)
@@ -125,11 +141,11 @@ module GitMaintain
 
             new_tags = local_tags - remote_tags
             if new_tags.empty? then
-                puts "All tags are already submitted."
+                log(:INFO,  "All tags are already submitted.")
                 return
             end
 
-            puts "This will officially release these tags: #{new_tags.join(", ")}"
+            log(:WARNING, "This will officially release these tags: #{new_tags.join(", ")}")
             rep = GitMaintain::confirm(opts, "release them")
             if rep != 'y' then
                 raise "Aborting.."
@@ -179,7 +195,7 @@ module GitMaintain
                 puts runGitImap("< #{mail_path}; rm -f #{mail_path}")
             end
 
-            puts "Last chance to cancel before submitting"
+            log(:WARNING, "Last chance to cancel before submitting")
             rep= GitMaintain::confirm(opts, "submit these releases")
             if rep != 'y' then
                 raise "Aborting.."

data/lib/travis.rb

@@ -15,6 +15,10 @@ module GitMaintain
         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
@@ -35,8 +39,8 @@ module GitMaintain
             return @cachedJson[query_label] if @cachedJson[query_label] != nil
             url = TRAVIS_URL + query
             uri = URI(url)
-            puts "# Querying travis..."
-            puts "# #{url}" if ENV["DEBUG_TRAVIS"].to_s() != ""
+            log(:INFO, "Querying travis...")
+            log(DEBUG_TRAVIS, url)
             response = fetch(uri)
             raise("Travis request failed '#{url}'") if response.code.to_s() != '200'
 
@@ -75,11 +79,11 @@ module GitMaintain
             return getJson(:br_stable, 'repos/' + @repo.remote_stable + '/branches')
         end
         def findBranch(sha1, resp)
-            puts "# Looking for build for #{sha1}" if ENV["DEBUG_TRAVIS"].to_s() != ""
+            log(:DEBUG_TRAVIS, "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
-                puts "# Found entry for sha #{commit["sha"]}" if ENV["DEBUG_TRAVIS"].to_s() != ""
+                log(:DEBUG_TRAVIS, "Found entry for sha #{commit["sha"]}")
                 next if commit["sha"] != sha1
                 return br
             }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: git-maintain
 version: !ruby/object:Gem::Version
-  version: 0.5.0.pre.11.g7c08aac
+  version: 0.5.0.pre.13.ge72a2b0
 platform: ruby
 authors:
 - Nicolas Morey-Chaisemartin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-02-06 00:00:00.000000000 Z
+date: 2019-02-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: github-release